diff --git a/lint-baseline.xml b/lint-baseline.xml
deleted file mode 100644
index 659b24d..0000000
--- a/lint-baseline.xml
+++ /dev/null
@@ -1,664 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"
-        errorLine1="                        ContactsContract.SimContacts.getSimAccounts(mContext.getContentResolver());"
-        errorLine2="                                                     ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"
-            line="541"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountName`"
-        errorLine1="                    simAccountWithDataSets.add(new AccountWithDataSet(simAccount.getAccountName(),"
-        errorLine2="                                                                                 ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"
-            line="543"
-            column="82"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"
-        errorLine1="                            simAccount.getAccountType(), null));"
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"
-            line="544"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `PhoneAccountHandle` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="        arguments.putParcelable(ARG_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);"
-        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/dialog/CallSubjectDialog.java"
-            line="249"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `PhoneAccountHandle` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="            intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);"
-        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="87"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#getCallCapablePhoneAccounts`"
-        errorLine1="            List&lt;PhoneAccountHandle> accountHandles = telecommMgr.getCallCapablePhoneAccounts();"
-        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="164"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#getPhoneAccount`"
-        errorLine1="                PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="166"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#hasCapabilities`"
-        errorLine1="                    if (account.hasCapabilities(PhoneAccount.CAPABILITY_VIDEO_CALLING)) {"
-        errorLine2="                                ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="168"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#hasCapabilities`"
-        errorLine1="                        if (account.hasCapabilities(PhoneAccountSdkCompat"
-        errorLine2="                                    ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="175"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#getCallCapablePhoneAccounts`"
-        errorLine1="            List&lt;PhoneAccountHandle> accountHandles = telecommMgr.getCallCapablePhoneAccounts();"
-        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="211"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#getPhoneAccount`"
-        errorLine1="                PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="213"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#hasCapabilities`"
-        errorLine1="                if (account != null &amp;&amp; account.hasCapabilities(PhoneAccount.CAPABILITY_CALL_SUBJECT)) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/CallUtil.java"
-            line="214"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.ContentProviderOperation#isInsert`"
-        errorLine1="            return cpoWrapper.getOperation().isInsert();"
-        errorLine2="                                             ~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/CompatUtils.java"
-            line="48"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.ContentProviderOperation#isUpdate`"
-        errorLine1="            return cpoWrapper.getOperation().isUpdate();"
-        errorLine2="                                             ~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/CompatUtils.java"
-            line="58"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.ContentProviderOperation#isDelete`"
-        errorLine1="            return cpoWrapper.getOperation().isDelete();"
-        errorLine2="                                             ~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/CompatUtils.java"
-            line="68"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.content.ContentProviderOperation#isAssertQuery`"
-        errorLine1="            return cpoWrapper.getOperation().isAssertQuery();"
-        errorLine2="                                             ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/CompatUtils.java"
-            line="77"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="                MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/interactions/ContactDeletionInteraction.java"
-            line="360"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.widget.QuickContactBadge#setPrioritizedMimeType`"
-        errorLine1="            quickContact.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/ContactEntryListAdapter.java"
-            line="721"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="            MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/ContactSaveService.java"
-            line="1221"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="            MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/DefaultContactBrowseListFragment.java"
-            line="1129"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"
-        errorLine1="                    ContactsContract.SimContacts.getSimAccounts("
-        errorLine2="                                                 ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java"
-            line="74"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"
-        errorLine1="                        simAccount.getAccountType())) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java"
-            line="77"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 24 (current min is 21): `android.provider.ContactsContract.Directory#ENTERPRISE_CONTENT_URI`"
-        errorLine1="    public static final Uri ENTERPRISE_CONTENT_URI = Directory.ENTERPRISE_CONTENT_URI;"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/DirectorySdkCompat.java"
-            line="26"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="                MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java"
-            line="436"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 21): `android.content.pm.PackageInfo#getLongVersionCode`"
-        errorLine1="                sCachedVersionCode = Long.toString(info.getLongVersionCode());"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/util/HelpUtils.java"
-            line="125"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="                    MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/interactions/ImportDialogFragment.java"
-            line="178"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="                    MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/interactions/ImportDialogFragment.java"
-            line="187"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 26 (current min is 21): `android.graphics.drawable.AdaptiveIconDrawable#getExtraInsetFraction`"
-        errorLine1="        return 1 / (1 + (2 * AdaptiveIconDrawable.getExtraInsetFraction()));"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/lettertiles/LetterTileDrawable.java"
-            line="293"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="            MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/MultiSelectContactsListFragment.java"
-            line="357"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="            MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/MultiSelectContactsListFragment.java"
-            line="362"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getIcon`"
-        errorLine1="            return phoneAccount.getIcon();"
-        errorLine2="                                ~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneAccountCompat.java"
-            line="45"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.graphics.drawable.Icon#loadDrawable`"
-        errorLine1="        return accountIcon.loadDrawable(context);"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneAccountCompat.java"
-            line="84"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 23 (current min is 21): `android.telecom.PhoneAccount`"
-        errorLine1="            return (Drawable) PhoneAccount.class.getMethod(&quot;createIconDrawable&quot;, Context.class)"
-        errorLine2="                              ~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneAccountCompat.java"
-            line="91"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.PhoneNumberUtils#createTtsSpannable`"
-        errorLine1="            return PhoneNumberUtils.createTtsSpannable(phoneNumber);"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java"
-            line="85"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.PhoneNumberUtils#createTtsSpan`"
-        errorLine1="            return PhoneNumberUtils.createTtsSpan(phoneNumber);"
-        errorLine2="                                    ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java"
-            line="93"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.PhoneNumberUtils#addTtsSpan`"
-        errorLine1="            PhoneNumberUtils.addTtsSpan(s, start, endExclusive);"
-        errorLine2="                             ~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java"
-            line="118"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 23 (current min is 21): `android.provider.ContactsContract.ProviderStatus#CONTENT_URI`"
-        errorLine1="                .registerContentObserver(ProviderStatus.CONTENT_URI, false, this);"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/ProviderStatusWatcher.java"
-            line="132"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 23 (current min is 21): `android.provider.ContactsContract.ProviderStatus#CONTENT_URI`"
-        errorLine1="                Cursor cursor = mContext.getContentResolver().query(ProviderStatus.CONTENT_URI,"
-        errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/ProviderStatusWatcher.java"
-            line="219"
-            column="69"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 23 (current min is 21): `android.provider.ContactsContract.ProviderStatus#CONTENT_URI`"
-        errorLine1="        if (!ProviderStatus.CONTENT_URI.equals(uri)) return;"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/list/ProviderStatusWatcher.java"
-            line="270"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 22 (current min is 21): `android.app.Activity#getReferrer`"
-        errorLine1="        if (mReferrer == null &amp;&amp; CompatUtils.isLollipopMr1Compatible() &amp;&amp; getReferrer() != null) {"
-        errorLine2="                                                                          ~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"
-            line="654"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 22 (current min is 21): `android.app.Activity#getReferrer`"
-        errorLine1="            mReferrer = getReferrer().getAuthority();"
-        errorLine2="                        ~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"
-            line="655"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"
-        errorLine1="        MessageFormat msgFormat = new MessageFormat("
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"
-            line="2226"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Class requires API level 23 (current min is 21): `android.telecom.PhoneAccountHandle`"
-        errorLine1="                        (PhoneAccountHandle) resultData.getParcelable("
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="130"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Cast from `PhoneAccountHandle` to `Parcelable` requires API level 23 (current min is 21)"
-        errorLine1="                        selectedAccountHandle);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="171"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#getPhoneAccount`"
-        errorLine1="            PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle);"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="247"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getLabel`"
-        errorLine1="            holder.labelTextView.setText(account.getLabel());"
-        errorLine2="                                                 ~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="251"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getAddress`"
-        errorLine1="            if (account.getAddress() == null ||"
-        errorLine2="                        ~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="252"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getAddress`"
-        errorLine1="                    TextUtils.isEmpty(account.getAddress().getSchemeSpecificPart())) {"
-        errorLine2="                                              ~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="253"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getAddress`"
-        errorLine1="                                account.getAddress().getSchemeSpecificPart()));"
-        errorLine2="                                        ~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java"
-            line="259"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 30 (current min is 21): `android.telephony.TelephonyManager#getSubscriptionId`"
-        errorLine1="            return new SimCard(telephony.getSimSerialNumber(), telephony.getSubscriptionId(),"
-        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/model/SimCard.java"
-            line="244"
-            column="74"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level S (current min is 21): `android.provider.SimPhonebookContract.SimRecords#getContentUri`"
-        errorLine1="                SimRecords.getContentUri("
-        errorLine2="                           ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/database/SimContactDaoImpl.java"
-            line="130"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 26 (current min is 21): `android.content.ContentResolver#query`"
-        errorLine1="            final Cursor cursor = mResolver.query(uri,"
-        errorLine2="                                            ~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/database/SimContactDaoImpl.java"
-            line="265"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telecom.TelecomManager#placeCall`"
-        errorLine1="            telecomManager.placeCall(intent.getData(), intent.getExtras());"
-        errorLine2="                           ~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/telecom/TelecomManagerCompat.java"
-            line="43"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 22 (current min is 21): `android.telephony.TelephonyManager#isVoiceCapable`"
-        errorLine1="            return telephonyManager.isVoiceCapable();"
-        errorLine2="                                    ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyManagerCompat.java"
-            line="49"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.TelephonyManager#getPhoneCount`"
-        errorLine1="            return telephonyManager.getPhoneCount();"
-        errorLine2="                                    ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyManagerCompat.java"
-            line="71"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.TelephonyManager#getDeviceId`"
-        errorLine1="            return telephonyManager.getDeviceId(slotId);"
-        errorLine2="                                    ~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyManagerCompat.java"
-            line="93"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.TelephonyManager#isTtyModeSupported`"
-        errorLine1="            return telephonyManager.isTtyModeSupported();"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyManagerCompat.java"
-            line="111"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.telephony.TelephonyManager#isHearingAidCompatibilitySupported`"
-        errorLine1="            return telephonyManager.isHearingAidCompatibilitySupported();"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyManagerCompat.java"
-            line="131"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 23 (current min is 21): `android.provider.Telephony.Threads#getOrCreateThreadId`"
-        errorLine1="            return Telephony.Threads.getOrCreateThreadId(context, recipient);"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/compat/TelephonyThreadsCompat.java"
-            line="51"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`android:contentInsetStartWithNavigation` requires API level 24 (current min is 21)"
-        errorLine1="        &lt;item name=&quot;android:contentInsetStartWithNavigation&quot;>72dp&lt;/item>"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/res/values/styles.xml"
-            line="215"
-            column="15"/>
-    </issue>
-
-</issues>
diff --git a/res/layout/contact_editor_fields.xml b/res/layout/contact_editor_fields.xml
index b9bda16..dd4e499 100644
--- a/res/layout/contact_editor_fields.xml
+++ b/res/layout/contact_editor_fields.xml
@@ -48,4 +48,29 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/legacy_fields_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAllCaps="true"
+            android:layout_marginStart="16dp"
+            android:textAppearance="?attr/textAppearanceOverline"
+            android:singleLine="true"
+            android:layout_marginBottom="24dp"
+            android:textSize="11sp"
+            android:text="@string/editor_uneditable_section_title" />
+
+        <LinearLayout
+            android:id="@+id/legacy_section_views"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+    </LinearLayout>
+
 </merge>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ae0b789..7f7e304 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Soek tans…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiket"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Kan nie hierdie inligting opdateer nie"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Kanselleer"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Terug"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"maak toe"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ddf5208..01a09bd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"በመፈለግ ላይ…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ቀን"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"መሰየሚያ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ይህን መረጃ ማዘመን አልተቻለም"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ይቅር"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ተመለስ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ዝጋ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c5d57d4..e30046a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"جارٍ البحث..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"التاريخ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"التصنيف"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"لا يمكن تعديل هذه المعلومات"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"إلغاء"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"رجوع"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"إغلاق"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0c5ccfe..cf3a1e7 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"সন্ধান কৰি থকা হৈছে…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"তাৰিখ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"লেবেল"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"এই তথ্য আপডে’ট কৰিব নোৱাৰি"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"বাতিল কৰক"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"উভতি যাওক"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"বন্ধ কৰক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f56c54a..3f207cf 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Axtarılır..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Tarix"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiket"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Bu məlumatları yeniləmək mümkün deyil"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Ləğv edin"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Geri"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"qapadın"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bb23865..9ac0f8e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Pretražuje se..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Oznaka"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ne možete da ažurirate ove informacije"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Otkaži"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Nazad"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zatvorite"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5aaf751..d406a8d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Пошук..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Метка"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Гэту інфармацыю немагчыма абнавіць"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Скасаваць"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"закрыць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1ca635b..4eaa6ca 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Търси се..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Етикет"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Тази информация не може да се актуализира"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Отказ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"затваряне"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e974eae..117e908 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"সার্চ করছে..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"তারিখ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"লেবেল"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"এই তথ্য আপডেট করতে পারবেন না"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"বাতিল করুন"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ফিরুন"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"বন্ধ করুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index f9f4af6..eb12dfa 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Pretraživanje…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Oznaka"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Nije moguće ažurirati ove informacije"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Otkaži"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Nazad"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zatvori"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8536460..8b5bf86 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"S\'està cercant..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiqueta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"No es pot actualitzar aquesta informació"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancel·la"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Enrere"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"tanca"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6d2480e..d80a877 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Vyhledávání..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Štítek"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Tyto informace nemůžete upravit"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Zrušit"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Zpět"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zavřít"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 730dcf5..229416e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -111,7 +111,7 @@
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"Føjet til etiket"</string>
     <string name="groupSavedErrorToast" msgid="8456912862816145318">"Ændringerne af etiketten kan ikke gemmes"</string>
     <string name="groupExistsErrorMessage" msgid="912222525098791136">"Etiketten findes allerede"</string>
-    <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Nogle kontakter har ikke e-mails."</string>
+    <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Nogle kontakter har ikke mails."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Nogle kontakter har ikke telefonnumre."</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"Send mail"</string>
     <string name="menu_sendMessageOption" msgid="8051852013078110910">"Send besked"</string>
@@ -120,7 +120,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"Ingen kontakter"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"Føj \"<xliff:g id="EMAIL">%s</xliff:g>\" til kontakter?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"Navne på dine kontakter"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Klik for at gå tilbage til forrige skærmbillede"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Klik for at gå tilbage til forrige skærm"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Tilføj telefonnummer"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Tilføj mail"</string>
     <string name="missing_app" msgid="5674389915738964148">"Der blev ikke fundet nogen app, der kan håndtere denne handling."</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Søger..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dato"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiket"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"DIsse oplysninger kan ikke opdateres"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annuller"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Tilbage"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"luk"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f65caad..c9d2962 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Suche..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Diese Informationen können nicht aktualisiert werden"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Abbrechen"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Zurück"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"Schließen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f4c70d9..b79a940 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -91,7 +91,7 @@
     <string name="customLabelPickerTitle" msgid="816694850254307154">"Προσαρμοσμένο όνομα ετικέτας"</string>
     <string name="removePhoto" msgid="1190099414600730001">"Κατάργηση εικόνας"</string>
     <string name="noContacts" msgid="3030512741779213810">"Η λίστα επαφών σας είναι άδεια"</string>
-    <string name="emptyGroup" msgid="8598261660865081152">"Δεν υπάρχουν επαφές με αυτή την εκτικέτα"</string>
+    <string name="emptyGroup" msgid="8598261660865081152">"Δεν υπάρχουν επαφές με αυτή την ετικέτα"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"Δεν υπάρχουν επαφές σε αυτόν το λογαριασμό"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"Η λίστα επαφών σας είναι άδεια"</string>
     <string name="contactSavedNamedToast" msgid="3067050290584834386">"Η επαφή \"<xliff:g id="DISPLAY_NAME">%s</xliff:g>\" αποθηκεύτηκε"</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Αναζήτηση…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Ημερομηνία"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Ετικέτα"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Δεν είναι δυνατή η ενημέρωση αυτής της πληροφορίας"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Ακύρωση"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Πίσω"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"κλείσιμο"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 53ba496..e4d3500 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Searching…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Can\'t update this info"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancel"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Back"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"close"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 579ad61..ff4bb7b 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Searching…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Can’t update this info"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancel"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Back"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"close"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 53ba496..e4d3500 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Searching…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Can\'t update this info"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancel"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Back"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"close"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 53ba496..e4d3500 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Searching…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Can\'t update this info"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancel"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Back"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"close"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b87d768..616b323 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎Searching…‎‏‎‎‏‎"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎Date‎‏‎‎‏‎"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎Label‎‏‎‎‏‎"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎Can’t update this info‎‏‎‎‏‎"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎Back‎‏‎‎‏‎"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎close‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 11bbacd..eb4d4ce 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Buscando..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Fecha"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiqueta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"No se puede actualizar esta información"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Atrás"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"cerrar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b79c848..ac394fd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Buscando..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Fecha"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiqueta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Esta información no se puede actualizar"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Atrás"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"cerrar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e770e49..e49a0fb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Otsimine ..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Kuupäev"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Silt"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Seda teavet ei saa värskendada"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Tühista"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Tagasi"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"sule"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index df7f2f5..b61a100 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -84,8 +84,8 @@
     <string name="deleteConfirmation" msgid="3727809366015979585">"Kontaktua ezabatu nahi duzu?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"Ezabatu"</string>
     <string name="invalidContactMessage" msgid="6204402264821083362">"Ez dago horrelako kontakturik."</string>
-    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Hasierako pantailan gehitu da kontaktua."</string>
-    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"Hasierako pantailan gehitu da <xliff:g id="NAME">%s</xliff:g>."</string>
+    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Orri nagusian gehitu da kontaktua."</string>
+    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"Orri nagusian gehitu da <xliff:g id="NAME">%s</xliff:g>."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Ez dago irudi erabilgarririk gailuan."</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Kontaktuaren argazkia"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"Etiketa pertsonalizatuaren izena"</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Bilatzen…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiketa"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ezin da eguneratu informazioa"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Utzi"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Atzera"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"itxi"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 55fd8a8..946a47f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"در حال جستجو..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"تاریخ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"برچسب"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"این اطلاعات به‌روز نمی‌شود"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"لغو"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"برگشت"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"بستن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d3176e6..df0753a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Haetaan..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Päivämäärä"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Tunniste"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Tietoja ei voi päivittää"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Peru"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Takaisin"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"sulje"</string>
@@ -458,7 +459,7 @@
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Avoimen lähdekoodin ohjelmiston käyttöluvan tiedot"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Tietosuojakäytäntö"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Palveluehdot"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Käyttöehdot"</string>
     <string name="activity_title_licenses" msgid="6434398894019119709">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"URL-osoitteen avaus epäonnistui."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>, valittu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e051d63..0d06d89 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Recherche…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Étiquette"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Impossible de mettre à jour ces renseignements"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annuler"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Précédent"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"fermer"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b893399..5d14038 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Recherche…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Ajouter libellé"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Informations non modifiables"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annuler"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Retour"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"fermer"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 2188631..9be98dd 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Buscando..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiqueta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Non se pode actualizar esta información"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Volver"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"pechar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 52e02b6..62d7ea3 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"શોધી રહ્યું છે..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"તારીખ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"લેબલ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"આ માહિતી અપડેટ કરી શકાતી નથી"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"રદ કરો"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"પાછળ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"બંધ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e705659..4303906 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"खोज रहा है…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"तारीख"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"इस जानकारी में बदलाव नहीं किया जा सकता"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"रद्द करें"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"वापस जाएं"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"बंद करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index aa85f37..03a6557 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Pretraživanje..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Oznaka"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ti se podaci ne mogu ažurirati"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Odustani"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Natrag"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zatvaranje"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 75d0cc7..80fa653 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Keresés..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dátum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Címke"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ez az információ nem módosítható"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Mégse"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Vissza"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"bezárás"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 2c80970..4089d4d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Որոնում..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Ամսաթիվ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Պիտակ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Այս տվյալները հնարավոր չէ թարմացնել"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Չեղարկել"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Հետ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"փակել"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index aeaa7a1..6f2495b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Menelusuri..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Tanggal"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Beri Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Tidak dapat memperbarui info ini"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Batal"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Kembali"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"tutup"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 73a167c..7aca09a 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Leitar…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dagsetning"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Flokkur"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ekki er hægt að uppfæra þessar upplýsingar"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Hætta við"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Til baka"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"loka"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d6a94a4..a17a424 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Ricerca..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etichetta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Impossibile aggiornare queste informazioni"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annulla"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Indietro"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"chiudi"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b1d0300..d868cea 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"מחפש..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"תאריך"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"תווית"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"אי אפשר לשנות את המידע הזה"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ביטול"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"הקודם"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"סגירה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a5d50d2..97b7c29 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"検索しています..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"日付"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ラベル"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"この情報は更新できません"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"キャンセル"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"戻る"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"閉じる"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index d6a3fcb..eb6821c 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ძიება..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"თარიღი"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ლეიბლი"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ამ ინფორმაციის განახლება შეუძლებელია"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"გაუქმება"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"უკან"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"დახურვა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 4ef74c7..ea0ee62 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Іздеуде…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Күні"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Белгі"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Бұл ақпаратты жаңарту мүмкін емес"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Жабу"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Артқа"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"жабу"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9543cdb..be57b04 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"កំពុង​រក..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"កាលបរិច្ឆេទ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ស្លាក"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"មិន​អាច​ធ្វើបច្ចុប្បន្នភាព​ព័ត៌មាន​នេះ​បាន​ទេ"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"បោះបង់"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ថយក្រោយ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"បិទ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index de6b148..c7f349f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -50,12 +50,12 @@
     <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"ನೀವು ಈಗಾಗಲೇ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು ಮತ್ತು ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಲಿಂಕ್ ರದ್ದುಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"ಉಳಿಸಿ ಮತ್ತು ಅನ್‌ಲಿಂಕ್‌ ಮಾಡಿ"</string>
     <string name="joinConfirmation" msgid="1245184431169363397">"ನೀವು ಈಗಾಗಲೇ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು ಮತ್ತು ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕದ ಜೊತೆಗೆ ಲಿಂಕ್ ಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="joinConfirmation_positive_button" msgid="8300713422725610480">"ಉಳಿಸು ಮತ್ತು ಲಿಂಕ್‌ ಮಾಡು"</string>
+    <string name="joinConfirmation_positive_button" msgid="8300713422725610480">"ಸೇವ್ ಮಾಡಿ ಮತ್ತು ಲಿಂಕ್‌ ಮಾಡಿ"</string>
     <string name="contacts_linking_progress_bar" msgid="7922930766022513619">"ಲಿಂಕ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="contacts_unlinking_progress_bar" msgid="5696679068872394167">"ಅನ್‌ಲಿಂಕ್ ಮಾಡುತ್ತಿದೆ"</string>
     <string name="menu_joinAggregate" msgid="3116395302755287038">"ಲಿಂಕ್‌"</string>
     <string name="menu_linkedContacts" msgid="6363718333551613063">"ಲಿಂಕ್ ಮಾಡಲಾದ ಸಂಪರ್ಕ ವೀಕ್ಷಿಸಿ"</string>
-    <string name="menu_save" msgid="7204524700499687371">"ಉಳಿಸು"</string>
+    <string name="menu_save" msgid="7204524700499687371">"ಸೇವ್ ಮಾಡಿ"</string>
     <string name="titleJoinContactDataWith" msgid="7342386037654890242">"ಲಿಂಕ್ ಸಂಪರ್ಕಗಳು"</string>
     <string name="blurbJoinContactDataWith" msgid="132105056919797709">"ನೀವು <xliff:g id="NAME">%s</xliff:g> ಅವರೊಂದಿಗೆ ಲಿಂಕ್ ಮಾಡಲು ಬಯಸುವ ಸಂಪರ್ಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ:"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="8347769365870796983">"ಸೂಚಿಸಲಾದ ಸಂಪರ್ಕಗಳು"</string>
@@ -94,8 +94,8 @@
     <string name="emptyGroup" msgid="8598261660865081152">"ಈ ಲೇಬಲ್‌ನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"ಈ ಖಾತೆಯಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಲಾಗಿದೆ"</string>
-    <string name="contactSavedToast" msgid="4370392215196995301">"ಸಂಪರ್ಕ‌ವನ್ನು ಉಳಿಸಲಾಗಿದೆ"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಸಂಪರ್ಕವನ್ನು ಸೇವ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="contactSavedToast" msgid="4370392215196995301">"ಸಂಪರ್ಕ‌ವನ್ನು ಸೇವ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"ಸಂಪರ್ಕಗಳನ್ನು ಅನ್‌ಲಿಂಕ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"ಸಂಪರ್ಕ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲಾಗಲಿಲ್ಲ"</string>
     <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"ಸಂಪರ್ಕದ ಲಿಂಕ್ ರದ್ದು ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ದಿನಾಂಕ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ಲೇಬಲ್"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ಈ ಮಾಹಿತಿಯನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ರದ್ದುಮಾಡಿ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ಹಿಂದೆ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ಮುಚ್ಚು"</string>
@@ -437,7 +438,7 @@
     <string name="menu_contacts_filter" msgid="5854584270038139275">"ಪ್ರದರ್ಶಿಸಲು ಸಂಪರ್ಕಗಳು"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"ಪ್ರದರ್ಶಿಸಲು ಸಂಪರ್ಕಗಳು"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"ವೀಕ್ಷಣೆಯನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string>
-    <string name="menu_custom_filter_save" msgid="2412959737200856930">"ಉಳಿಸು"</string>
+    <string name="menu_custom_filter_save" msgid="2412959737200856930">"ಸೇವ್ ಮಾಡಿ"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"ಮೆಚ್ಚಿನವುಗಳು"</string>
     <string name="menu_import" msgid="2206768098740726906">"ಆಮದು ಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0cc708f..1a5ac8e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"검색 중…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"날짜"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"라벨"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"아래의 정보는 업데이트할 수 없습니다"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"취소"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"뒤로"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"닫기"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index bb9aacf..9343407 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Изделүүдө…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Энбелги"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Бул маалымат жаңыртылбай жатат"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Жок"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Артка"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"жабуу"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4e67e81..9cc1b76 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ກຳລັງຊອກຫາ..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ວັນທີ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ປ້າຍກຳກັບ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ບໍ່ສາມາດອັບເດດຂໍ້ມູນນີ້ໄດ້"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ຍົກເລີກ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ກັບຄືນ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ປິດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2913fbc..ea79f2f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Ieškoma…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiketė"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Negalima atnaujinti šios informacijos"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Atšaukti"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Atgal"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"uždaryti"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dcad525..7df5b4e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Notiek meklēšana..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datums"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Iezīme"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Nevar atjaunināt šo informāciju"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Atcelt"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Atpakaļ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"aizvērt"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ee154db..959e2e2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Се пребарува..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Датум"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Етикета"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Информацииве не може да се ажурираат"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Откажи"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"затвори"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index dff410a..063e8d2 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"തിരയുന്നു…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"തീയതി"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ലേബൽ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ഈ വിവരങ്ങൾ അപ്ഡേറ്റ് ചെയ്യാനാകില്ല"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"റദ്ദാക്കുക"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"മടങ്ങുക"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"അടയ്‌ക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index d8b5f47..eb84601 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Хайж байна..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Огноо"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Шошго"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Энэ мэдээллийг шинэчлэх боломжгүй байна"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Цуцлах"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Буцах"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"хаах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3f34d92..c3fde66 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"शोधत आहे..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"तारीख"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ही माहिती अपडेट करू शकत नाही"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"रद्द करा"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"परत"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"बंद करा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6b01637..287ea0c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Mencari..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Tarikh"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Tidak dapat mengemaskinikan maklumat ini"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Batal"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Kembali"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"tutup"</string>
@@ -480,7 +481,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Ketepikan"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Penyegerakan akaun dimatikan. Ketik untuk menghidupkannya."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Hidupkan autosegerak?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Perubahan yang anda buat kepada semua apl dan akaun, bukan hanya Kenalan Google, akan dikemas kini antara web dengan peranti anda."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Perubahan yang anda buat kepada semua apl dan akaun, bukan hanya Google Contacts, akan dikemas kini antara web dengan peranti anda."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Hidupkan"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Tiada sambungan"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index cfee366..2d53f9a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ရှာဖွေနေသည်…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ရက်စွဲ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"အညွှန်း"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ဤအချက်အလက်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"မလုပ်တော့"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"နောက်သို့"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ပိတ်ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6ea2fea..9b649ec 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Søker …"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dato"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etikett"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Kan ikke oppdatere denne informasjonen"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Avbryt"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Tilbake"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"lukk"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index caed805..d6206c1 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"खोजिँदै छ..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"मिति"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"यो जानकारी सम्पादन गर्न सकिँदैन"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"रद्द गर्नुहोस्"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"पछाडि"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"बन्द गर्नुहोस्"</string>
@@ -158,7 +159,7 @@
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"सम्पर्कहरूमा जोड्नुहोस्"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"बन्द गर्नुहोस्"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"वर्ष सामेल गर्नुहोस्"</string>
-    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"खाता थप्नुहोस्"</string>
+    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"खाता हाल्नुहोस्"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"आयात गर्नुहोस्"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"नयाँ लेबल सिर्जना गर्नुहोस्..."</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" लेबललाई हटाउने हो? (सम्पर्कहरू मेटिने छैनन्।)"</string>
@@ -175,7 +176,7 @@
     <string name="title_edit_group" msgid="4246193439931854759">"सम्पर्कहरू हटाउनुहोस्"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"मेरो स्थानीय प्रोफाइल"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"मेरो <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> प्रोफाइल"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"एक मिनेट जति लगाएर एउटा खाता थप्नुहोस् जसले तपाईंका सम्पर्कहरूलाई Google मा ब्याक अप गर्ने छ।"</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"एक मिनेट जति लगाएर एउटा खाता हाल्नुहोस् जसले तपाईंका सम्पर्कहरूलाई Google मा ब्याक अप गर्ने छ।"</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"नयाँ सम्पर्कहरू <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> मा सुरक्षित गरिनेछन्।"</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"नयाँ सम्पर्क ठेगानाहरूका लागि डिफल्ट खाता छान्‍नुहोस्:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"नयाँ सम्पर्क बनाउने"</string>
@@ -185,8 +186,8 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"लिंक गरिएका सम्पर्कहरू"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"थप्नुहोस्"</string>
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"अनलिंक गर्ने"</string>
-    <string name="add_account" msgid="3071396624500839020">"खाता थप्नुहोस्"</string>
-    <string name="add_new_account" msgid="573368229646104110">"नयाँ खाता थप्नुहोस्"</string>
+    <string name="add_account" msgid="3071396624500839020">"खाता हाल्नुहोस्"</string>
+    <string name="add_new_account" msgid="573368229646104110">"नयाँ खाता हाल्नुहोस्"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाइलहरू निर्यात गर्नुहोस्"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"थप हेर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c703deb..e9fe9b1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Zoeken..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Labelen"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"U kunt deze informatie niet updaten"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annuleren"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Terug"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"sluiten"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 127af0b..95c97ac 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ସର୍ଚ୍ଚ କରାଯାଉଛି…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ତାରିଖ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ଲେବଲ୍"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ଏହି ସୂଚନା ଅପଡେଟ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ପଛକୁ ଫେରନ୍ତୁ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ବନ୍ଦ କରନ୍ତୁ"</string>
@@ -280,7 +281,7 @@
     <string name="status_available" msgid="8081626460682959098">"ଉପଲବ୍ଧ"</string>
     <string name="status_away" msgid="2677693194455091315">"ନାହାନ୍ତି"</string>
     <string name="status_busy" msgid="2759339190187696727">"ବ୍ୟସ୍ତ ଅଛନ୍ତି"</string>
-    <string name="local_invisible_directory" msgid="5936234374879813300">"ଅନ୍ୟାନ୍ୟ"</string>
+    <string name="local_invisible_directory" msgid="5936234374879813300">"ଅନ୍ୟ"</string>
     <string name="directory_search_label" msgid="2602118204885565153">"ଡାଇରେକ୍ଟୋରୀ"</string>
     <string name="directory_search_label_work" msgid="2392128956332931231">"କାର୍ଯ୍ୟ ଡାଇରେକ୍ଟୋରୀ"</string>
     <string name="local_search_label" msgid="6692495405531144805">"ସମସ୍ତ ଯୋଗାଯୋଗ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7a73e5e..0e74029 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ਤਾਰੀਖ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ਲੇਬਲ ਲਗਾਓ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ਰੱਦ ਕਰੋ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ਪਿੱਛੇ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ਬੰਦ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 92e3c11..8c228df 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Wyszukiwanie…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Dodaj etykietę"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Nie można zaktualizować tych informacji"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Anuluj"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Wstecz"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zamknij"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 046d238..f63a988 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Pesquisando..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Marcador"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Não é possível atualizar a informação"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Voltar"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"fechar"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5d52e4b..2cc5aba 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"A pesquisar..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiqueta"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Não é possível atualizar estas informações"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Anterior"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"fechar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 046d238..f63a988 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Pesquisando..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Marcador"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Não é possível atualizar a informação"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Cancelar"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Voltar"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"fechar"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5f80c46..aa9fa60 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Se caută..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dată"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etichetă"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Aceste informații nu pot fi actualizate"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Anulați"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Înapoi"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"închideți"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ddd7c72..586207f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Поиск…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Ярлык"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Эти данные невозможно обновить"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Отмена"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"закрыть"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index c578fd4..9ceb420 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"සොයමින්..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"දිනය"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ලේබලය"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"මෙම තතු යාවත්කාලීන කළ නොහැක"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"අවලංගු කරන්න"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ආපසු"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"වසන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index be5af84..d9823b9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Hľadá sa…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Dátum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Štítok"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Tieto údaje nemôžete aktualizovať"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Zrušiť"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Späť"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zavrieť"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 399bce5..a232ab2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Iskanje ..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Dodaj oznako"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Teh podatkov ni mogoče posodobiti"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Prekliči"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Nazaj"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"zapri"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 989fca1..91e3885 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Po kërkon..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiketa"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Këto informacione nuk mund të përditësohen"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Anulo"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Prapa"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"mbyll"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7b1e0c7..96df34e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Претражује се..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Датум"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Ознака"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Не можете да ажурирате ове информације"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Откажи"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"затворите"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9499a95..12263d0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Söker …"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etikett"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Det går inte att uppdatera den här informationen"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Avbryt"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Tillbaka"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"stäng"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8e4a158..ae6be25 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -112,7 +112,7 @@
     <string name="groupSavedErrorToast" msgid="8456912862816145318">"Imeshindwa kuhifadhi mabadiliko ya lebo"</string>
     <string name="groupExistsErrorMessage" msgid="912222525098791136">"Lebo hiyo tayari ipo"</string>
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Baadhi ya watu hawana anwani za barua pepe."</string>
-    <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Baadhi ya anwani hazina nambari za simu."</string>
+    <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Baadhi ya anwani hazina namba za simu."</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"Tuma barua pepe"</string>
     <string name="menu_sendMessageOption" msgid="8051852013078110910">"Tuma ujumbe"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"Chagua Anwani"</string>
@@ -121,7 +121,7 @@
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"Ongeza \"<xliff:g id="EMAIL">%s</xliff:g>\" kwa anwani?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"Majina ya anwani zako"</string>
     <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Bofya ili urudi kwenye skrini iliyotangulia"</string>
-    <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Ongeza nambari ya simu"</string>
+    <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Ongeza namba ya simu"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Ongeza anwani ya barua pepe"</string>
     <string name="missing_app" msgid="5674389915738964148">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
     <string name="menu_share" msgid="6343022811796001773">"Shiriki"</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Inatafuta…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Tarehe"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Lebo"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Huwezi kusasisha maelezo haya"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Ghairi"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Rudi nyuma"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"funga"</string>
@@ -239,7 +240,7 @@
     <string name="call_other" msgid="2264440725373659661">"Piga simu"</string>
     <string name="call_callback" msgid="1226584395279365027">"Mpigie"</string>
     <string name="call_car" msgid="4102050357690774180">"Piga simu kwa gari"</string>
-    <string name="call_company_main" msgid="7922526725703041965">"Pigia nambari kuu ya simu ya kampuni"</string>
+    <string name="call_company_main" msgid="7922526725703041965">"Pigia namba kuu ya simu ya kampuni"</string>
     <string name="call_isdn" msgid="6313441227468730170">"Piga simu kwa ISDN"</string>
     <string name="call_main" msgid="3732801640247896775">"Piga simu kuu"</string>
     <string name="call_other_fax" msgid="4273636173311108108">"Piga simu ya faksi"</string>
@@ -287,7 +288,7 @@
     <string name="description_quick_contact_for" msgid="6364906818231956042">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Hakuna jina)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Unaowasiliana nao zaidi"</string>
-    <string name="list_filter_phones" msgid="6839133198968393843">"Anwani zote zilizo na nambari za simu"</string>
+    <string name="list_filter_phones" msgid="6839133198968393843">"Anwani zote zilizo na namba za simu"</string>
     <string name="list_filter_phones_work" msgid="5583425697781385616">"Anwani za watu wa kazini"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"Tazama masasisho"</string>
     <string name="account_phone" msgid="8044426231251817556">"Kifaa"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 0f81b40..491f246 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"தேடுகிறது..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"தேதி"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"லேபிளைச் சேர்"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"இந்தத் தகவலை மாற்ற முடியாது"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ரத்துசெய்யும் பட்டன்"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"முந்தையதற்குச் செல்லும் பட்டன்"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"மூடும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 057f809..321a022 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -28,7 +28,7 @@
     <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"ఎంచుకోండి"</string>
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"కొత్త కాంటాక్ట్‌ క్రియేట్ చేయి"</string>
     <string name="searchHint" msgid="1487501532610025473">"కాంటాక్ట్‌లను సెర్చ్ చేయండి"</string>
-    <string name="menu_addStar" msgid="4903812703386825130">"ఇష్టమైనవాటికి జోడించండి"</string>
+    <string name="menu_addStar" msgid="4903812703386825130">"ఫేవరెట్స్‌కు జోడించండి"</string>
     <string name="menu_removeStar" msgid="3707373931808303701">"ఇష్టమైనవాటి నుండి తీసివేయండి"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"ఇష్టమైనవి నుండి తీసివేయబడింది"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"ఇష్టమైనవికి జోడించబడింది"</string>
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"శోధిస్తోంది..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"తేదీ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"లేబుల్"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ఈ సమాచారాన్ని అప్‌డేట్ చేయడం సాధ్యం కాదు"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"రద్దు చేస్తుంది"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"వెనుకకు వెళ్తుంది"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"మూసివేస్తుంది"</string>
@@ -156,7 +157,7 @@
     <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"ఫోన్ నంబర్"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"కాంటాక్ట్‌లకు జోడించండి"</string>
-    <string name="non_phone_close" msgid="2792373584950696532">"మూసివేయి"</string>
+    <string name="non_phone_close" msgid="2792373584950696532">"మూసివేయండి"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"సంవత్సరాన్ని చేర్చు"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"ఖాతాను జోడించండి"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"దిగుమతి చేయండి"</string>
@@ -187,7 +188,7 @@
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"అన్‌లింక్ చేయి"</string>
     <string name="add_account" msgid="3071396624500839020">"ఖాతాను జోడించండి"</string>
     <string name="add_new_account" msgid="573368229646104110">"కొత్త ఖాతాను జోడించండి"</string>
-    <string name="menu_export_database" msgid="1658249125751926885">"డేటాబేస్ ఫైళ్లను ఎగుమతి చేయి"</string>
+    <string name="menu_export_database" msgid="1658249125751926885">"డేటాబేస్ ఫైళ్లను ఎగుమతి చేయండి"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"కొత్త కాంటాక్ట్‌ను క్రియేట్ చేయండి"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"మరిన్ని చూడండి"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"తక్కువ చూడండి"</string>
@@ -412,7 +413,7 @@
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"కాంటాక్ట్ NFC ద్వారా స్వీకరించబడింది"</string>
     <string name="caching_vcard_title" msgid="6333926052524937628">"కాష్ చేస్తోంది"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>లో <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> దిగుమతి చేయబడుతోంది: <xliff:g id="NAME">%3$s</xliff:g>"</string>
-    <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ఫైల్‌కు ఎగుమతి చేయి"</string>
+    <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ఫైల్‌కు ఎగుమతి చేయండి"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"ఇలా వ‌ర్గీక‌రించు"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ఫొనెటిక్ పేరు"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"ఎల్లప్పుడూ చూపండి"</string>
@@ -441,7 +442,7 @@
     <string name="hint_findContacts" msgid="5554298639062659655">"కాంటాక్ట్‌లను సెర్చ్ చేయండి"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"ఇష్టమైనవి"</string>
     <string name="menu_import" msgid="2206768098740726906">"దిగుమతి చేయండి"</string>
-    <string name="menu_export" msgid="1217402092617629429">"ఎగుమతి చేయి"</string>
+    <string name="menu_export" msgid="1217402092617629429">"ఎగుమతి చేయండి"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="SOURCE">%2$s</xliff:g> ద్వారా <xliff:g id="DATE">%1$s</xliff:g>"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 455831d..df03f15 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"กำลังค้นหา..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"วันที่"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ป้ายกำกับ"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"อัปเดตข้อมูลนี้ไม่ได้"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"ยกเลิก"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"กลับ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ปิด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9b67c94..66694db 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Naghahanap…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Petsa"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Lagyan ng label"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Hindi ma-update ang impormasyong ito"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Kanselahin"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Bumalik"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"isara"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 98a87be..4e67f70 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Aranıyor…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Tarih"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiket"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Bu bilgiler güncellenemez"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"İptal edilir"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Geri"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"kapatın"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 38aa8b7..1b3173a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Пошук..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Мітка"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Неможливо оновити цю інформацію"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Скасувати"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"закрити"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3262dc4..5617e22 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"تلاش کر رہا ہے…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"تاریخ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"لیبل"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"اس معلومات کو اپ ڈیٹ نہیں کر سکتے"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"منسوخ کریں"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"پیچھے"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"بند کریں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9ebea94..80b2dc7 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Qidirilmoqda…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Sana"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Yorliq"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Bu axborotni yangilash imkonsiz"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Bekor qilish"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Orqaga"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"yopish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3ffa0d8..d6a3783 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Đang tìm kiếm…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Ngày"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Nhãn"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Không thể cập nhật thông tin này"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Hủy"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Quay lại"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"đóng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cd687b9..cf30f0c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"正在搜索..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"标签"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"无法更新此信息"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"取消"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"返回"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"关闭"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index bdb619c..14bceb9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"正在搜尋..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"標籤"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"無法更新此資料"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"取消"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"返回"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"關閉"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7ce4c85..f0b06a3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"搜尋中…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"標籤"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"無法更新這項資訊"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"取消"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"返回"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"關閉"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fa5d2ed..d5432a1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -144,6 +144,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"Iyasesha..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Idethi"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Ilebula"</string>
+    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Ayikwazi ukubuyekeza lolu lwazi"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Khansela"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Phindela emuva"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"vala"</string>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index fb6fc5a..dce82b6 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -44,6 +44,9 @@
     <!-- An ID to be used for contents of a custom dialog so that its state be preserved -->
     <item type="id" name="custom_dialog_content" />
 
+    <!-- An ID to be used for tagging text for copy in legacy fields. -->
+    <item name="text_to_copy" type="id"/>
+
     <!-- Menu ID for profile item -->
     <item type="id" name="nav_myprofile" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b608e12..fc24b10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -425,6 +425,9 @@
     <!-- The button to add an label field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
     <string name="group_edit_field_hint_text">Label</string>
 
+    <!-- Editor section title to show below shown editor fields are not editable. Users are only allowed to delete them. [CHAR LIMIT=NONE] -->
+    <string name="editor_uneditable_section_title">Can’t update this info</string>
+
     <!-- Content description for a cancel button. [CHAR LIMIT=NONE] -->
     <string name="cancel_button_content_description">Cancel</string>
 
diff --git a/src/com/android/contacts/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
index c02816a..6ab06bd 100644
--- a/src/com/android/contacts/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -114,4 +114,10 @@
      */
     public void editNewlyAddedField();
 
+    /**
+     * Marks the Editor field as a legacy field. Legacy fields are deprecated MIME types
+     * which are not fully supported in the editor.
+     * Adding or editing legacy field are not supported.
+     */
+    void setLegacyField(boolean isLegacyField);
 }
diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 35f107e..3dac5bb 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -57,6 +57,7 @@
 import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
 import com.android.contacts.widget.QuickContactImageView;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 
 import java.io.FileNotFoundException;
@@ -95,6 +96,9 @@
         mimetypeLayoutMap.put(Event.CONTENT_ITEM_TYPE, R.layout.event_field_editor_view);
     }
 
+    public static final ImmutableList<String> LEGACY_MIME_TYPE =
+        ImmutableList.of(Im.CONTENT_ITEM_TYPE, SipAddress.CONTENT_ITEM_TYPE);
+
     /**
      * Fetches a layout for a given mimetype.
      *
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 5d49064..28eeaf2 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -48,6 +48,13 @@
  */
 public class KindSectionView extends LinearLayout {
 
+    /** Callbacks for hosts of {@link KindSectionView}s. */
+    public interface Listener {
+
+        /** Invoked when all fields in a legacy {@link KindSectionView} are removed. */
+        void onEmptyLegacyKindSectionView();
+    }
+
     /**
      * Marks a name as super primary when it is changed.
      *
@@ -58,21 +65,21 @@
 
         private final ValuesDelta mValuesDelta;
         private final long mRawContactId;
-        private final RawContactEditorView.Listener mListener;
+        private final RawContactEditorView.Listener mEditorViewListener;
 
         public StructuredNameEditorListener(ValuesDelta valuesDelta, long rawContactId,
-                RawContactEditorView.Listener listener) {
+            RawContactEditorView.Listener editorViewListener) {
             mValuesDelta = valuesDelta;
             mRawContactId = rawContactId;
-            mListener = listener;
+            mEditorViewListener = editorViewListener;
         }
 
         @Override
         public void onRequest(int request) {
             if (request == Editor.EditorListener.FIELD_CHANGED) {
                 mValuesDelta.setSuperPrimary(true);
-                if (mListener != null) {
-                    mListener.onNameFieldChanged(mRawContactId, mValuesDelta);
+                if (mEditorViewListener != null) {
+                    mEditorViewListener.onNameFieldChanged(mRawContactId, mValuesDelta);
                 }
             } else if (request == Editor.EditorListener.FIELD_TURNED_EMPTY) {
                 mValuesDelta.setSuperPrimary(false);
@@ -119,6 +126,11 @@
 
         @Override
         public void onDeleteRequested(Editor editor) {
+            if (mIsLegacyField && mEditors.getChildCount() == 1) {
+                editor.deleteEditor();
+                mListener.onEmptyLegacyKindSectionView();
+                return;
+            }
             if (mShowOneEmptyEditor && mEditors.getChildCount() == 1) {
                 // If there is only 1 editor in the section, then don't allow the user to
                 // delete it.  Just clear the fields in the editor.
@@ -152,11 +164,13 @@
 
     private KindSectionData mKindSectionData;
     private ViewIdGenerator mViewIdGenerator;
-    private RawContactEditorView.Listener mListener;
+    private RawContactEditorView.Listener mEditorViewListener;
+    private Listener mListener;
 
     private boolean mIsUserProfile;
     private boolean mShowOneEmptyEditor = false;
     private boolean mHideIfEmpty = true;
+    private boolean mIsLegacyField = false;
 
     private LayoutInflater mLayoutInflater;
     private ViewGroup mEditors;
@@ -227,6 +241,13 @@
     }
 
     /**
+     * When {@code isLegacyField} is true, prevent users from editing the field.
+     */
+    void setLegacyField(boolean isLegacyField) {
+        this.mIsLegacyField = isLegacyField;
+    }
+
+    /**
      * Whether this is a name kind section view and all name fields (structured, phonetic,
      * and nicknames) are empty.
      */
@@ -277,10 +298,14 @@
      * Empty name editors are never added and at least one structured name editor is always
      * displayed, even if it is empty.
      */
-    public void setState(KindSectionData kindSectionData,
-            ViewIdGenerator viewIdGenerator, RawContactEditorView.Listener listener) {
+    public void setState(
+        KindSectionData kindSectionData,
+        ViewIdGenerator viewIdGenerator,
+        RawContactEditorView.Listener editorViewListener,
+        Listener listener) {
         mKindSectionData = kindSectionData;
         mViewIdGenerator = viewIdGenerator;
+        mEditorViewListener = editorViewListener;
         mListener = listener;
 
         // Set the icon using the DataKind
@@ -292,6 +317,9 @@
                 mIcon.setContentDescription(dataKind.titleRes == -1 || dataKind.titleRes == 0
                         ? "" : getResources().getString(dataKind.titleRes));
             }
+            if (mIsLegacyField) {
+                mIcon.setEnabled(false);
+            }
         }
 
         rebuildFromState();
@@ -359,7 +387,7 @@
         if (!mIsUserProfile) {
             // Don't set super primary for the me contact
             nameView.setEditorListener(new StructuredNameEditorListener(
-                    nameValuesDelta, rawContactDelta.getRawContactId(), mListener));
+                    nameValuesDelta, rawContactDelta.getRawContactId(), mEditorViewListener));
         }
         nameView.setDeletable(false);
         nameView.setValues(accountType.getKindForMimetype(DataKind.PSEUDO_MIME_TYPE_NAME),
@@ -414,6 +442,7 @@
         view.setEnabled(isEnabled());
         if (view instanceof Editor) {
             final Editor editor = (Editor) view;
+            editor.setLegacyField(mIsLegacyField);
             editor.setDeletable(true);
             editor.setEditorListener(editorListener);
             editor.setValues(dataKind, valuesDelta, rawContactDelta, !dataKind.editable,
@@ -593,4 +622,8 @@
         }
         return emptyEditors;
     }
+
+    public boolean isEditorEmpty() {
+        return mKindSectionData.getVisibleValuesDeltas().isEmpty();
+    }
 }
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index df4c5f9..3df3222 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -81,6 +81,8 @@
     private boolean mIsDeletable = true;
     private boolean mIsAttachedToWindow;
 
+    protected boolean mIsLegacyField;
+
     private EditType mType;
 
     private ViewIdGenerator mViewIdGenerator;
@@ -264,8 +266,8 @@
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
-        mLabel.setEnabled(!mReadOnly && enabled);
-        mDelete.setEnabled(!mReadOnly && enabled);
+        mLabel.setEnabled(!mReadOnly && enabled && !mIsLegacyField);
+        mDelete.setEnabled((!mReadOnly && enabled) || mIsLegacyField);
     }
 
     public Spinner getLabel() {
@@ -342,6 +344,10 @@
         return "";
     }
 
+    public void setLegacyField(boolean mIsLegacyField) {
+        this.mIsLegacyField = mIsLegacyField;
+    }
+
     protected void saveValue(String column, String value) {
         mEntry.put(column, value);
     }
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 19da5bc..755800a 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -50,6 +50,7 @@
 import android.widget.ListPopupWindow;
 import android.widget.TextView;
 
+import com.android.contacts.editor.KindSectionView;
 import com.android.contacts.GeoUtil;
 import com.android.contacts.R;
 import com.android.contacts.compat.PhoneNumberUtilsCompat;
@@ -80,7 +81,8 @@
 /**
  * View to display information from multiple {@link RawContactDelta}s grouped together.
  */
-public class RawContactEditorView extends LinearLayout implements View.OnClickListener {
+public class RawContactEditorView extends LinearLayout implements View.OnClickListener,
+    KindSectionView.Listener {
 
     static final String TAG = "RawContactEditorView";
 
@@ -218,6 +220,8 @@
 
     private PhotoEditorView mPhotoView;
     private ViewGroup mKindSectionViews;
+    private LinearLayout mLegacySectionLinearLayout;
+    private ViewGroup mLegacyKindSectionViews;
     private Map<String, KindSectionView> mKindSectionViewMap = new HashMap<>();
     private View mMoreFields;
 
@@ -259,6 +263,8 @@
 
         mPhotoView = (PhotoEditorView) findViewById(R.id.photo_editor);
         mKindSectionViews = (LinearLayout) findViewById(R.id.kind_section_views);
+        mLegacySectionLinearLayout = (LinearLayout) findViewById(R.id.legacy_fields_container);
+        mLegacyKindSectionViews = (LinearLayout) findViewById(R.id.legacy_section_views);
         mMoreFields = findViewById(R.id.more_fields);
         mMoreFields.setOnClickListener(this);
     }
@@ -277,6 +283,10 @@
         for (int i = 0; i < childCount; i++) {
             mKindSectionViews.getChildAt(i).setEnabled(enabled);
         }
+        final int legacyChildCount = mLegacyKindSectionViews.getChildCount();
+        for (int i = 0; i < legacyChildCount; i++) {
+            mLegacyKindSectionViews.getChildAt(i).setEnabled(false);
+        }
     }
 
     @Override
@@ -447,6 +457,8 @@
 
         mKindSectionViewMap.clear();
         mKindSectionViews.removeAllViews();
+        mLegacySectionLinearLayout.setVisibility(View.GONE);
+        mLegacyKindSectionViews.removeAllViews();
         mMoreFields.setVisibility(View.VISIBLE);
 
         mMaterialPalette = materialPalette;
@@ -531,7 +543,7 @@
         addKindSectionViews();
 
         mMoreFields.setVisibility(hasMoreFields() ? View.VISIBLE : View.GONE);
-
+        addLegacyKindSectionViews();
         if (mIsExpanded) showAllFields();
     }
 
@@ -874,6 +886,9 @@
         int i = -1;
 
         for (String mimeType : mSortedMimetypes) {
+            if(EditorUiUtils.LEGACY_MIME_TYPE.contains(mimeType)) {
+                continue;
+            }
             i++;
             // Ignore mime types that we've already handled
             if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
@@ -910,7 +925,7 @@
         // they will be the only types you add new values to initially for new contacts
         kindSectionView.setShowOneEmptyEditor(true);
 
-        kindSectionView.setState(kindSectionData, mViewIdGenerator, mListener);
+        kindSectionView.setState(kindSectionData, mViewIdGenerator, mListener, this);
 
         return kindSectionView;
     }
@@ -938,6 +953,55 @@
         return false;
     }
 
+    private void addLegacyKindSectionViews() {
+        boolean hasLegacyData = false;
+        for (String mimeType : EditorUiUtils.LEGACY_MIME_TYPE) {
+
+            KindSectionData kindSectionData = mKindSectionDataMap.get(mimeType);
+            if (kindSectionData != null && !kindSectionData.getVisibleValuesDeltas().isEmpty()) {
+                hasLegacyData = true;
+                KindSectionView kindSectionView =
+                    inflateLegacyKindSectionView(mKindSectionViews, kindSectionData);
+                mLegacyKindSectionViews.addView(kindSectionView);
+
+                // Keep a pointer to the KindSectionView for each mimeType
+                mKindSectionViewMap.put(mimeType, kindSectionView);
+            }
+        }
+
+        if (hasLegacyData) {
+            mLegacySectionLinearLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private KindSectionView inflateLegacyKindSectionView(
+        ViewGroup viewGroup, KindSectionData kindSectionData) {
+        KindSectionView kindSectionView =
+            (KindSectionView)
+                mLayoutInflater.inflate(
+                    R.layout.item_kind_section, viewGroup, /* attachToRoot =*/ false);
+        kindSectionView.setLegacyField(true);
+
+        kindSectionView.setState(kindSectionData, mViewIdGenerator, mListener, this);
+
+        return kindSectionView;
+    }
+
+    @Override
+    public void onEmptyLegacyKindSectionView() {
+        for (int i = mLegacyKindSectionViews.getChildCount() - 1; i >= 0; i--) {
+            View childView = mLegacyKindSectionViews.getChildAt(i);
+            if (childView instanceof KindSectionView
+                && ((KindSectionView) childView).isEditorEmpty()) {
+                mLegacyKindSectionViews.removeViewAt(i);
+            }
+        }
+
+        if (mLegacyKindSectionViews.getChildCount() == 0) {
+            mLegacySectionLinearLayout.setVisibility(View.GONE);
+        }
+    }
+
     private static void wlog(String message) {
         if (Log.isLoggable(TAG, Log.WARN)) {
             Log.w(TAG, message);
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 28fe87f..d7f9545 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -22,6 +22,8 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.text.Editable;
 import android.text.InputType;
@@ -49,6 +51,7 @@
 import com.android.contacts.model.account.AccountType.EditField;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.PhoneNumberFormatter;
+import com.android.contacts.ClipboardUtils;
 
 /**
  * Simple editor that handles labels and any {@link EditField} defined for the
@@ -57,7 +60,6 @@
  */
 public class TextFieldsEditorView extends LabeledEditorView {
     private static final String TAG = TextFieldsEditorView.class.getSimpleName();
-
     private EditText[] mFieldEditTexts = null;
     private ViewGroup mFields = null;
     protected View mExpansionViewContainer;
@@ -75,6 +77,12 @@
     private String mFixedDisplayName = "";
     private boolean needInputInitialize;
 
+    private final OnLongClickListener mOnLongClickListener =
+        v -> {
+            ClipboardUtils.copyText(
+                getContext(), /* label= */ null, (CharSequence) v.getTag(R.id.text_to_copy), true);
+            return true;
+        };
 
     public TextFieldsEditorView(Context context) {
         super(context);
@@ -164,7 +172,15 @@
 
         if (mFieldEditTexts != null) {
             for (int index = 0; index < mFieldEditTexts.length; index++) {
-                mFieldEditTexts[index].setEnabled(!isReadOnly() && enabled);
+                mFieldEditTexts[index].setEnabled(!isReadOnly() && enabled && !mIsLegacyField);
+                if (mIsLegacyField) {
+                    mFieldEditTexts[index].setFocusable(false);
+                    mFieldEditTexts[index].setClickable(false);
+                    mFieldEditTexts[index].setLongClickable(false);
+                }
+            }
+            if (mIsLegacyField && mFieldEditTexts.length > 0) {
+                setOnLongClickListenerOnContainer();
             }
         }
         if (mExpansionView != null) {
@@ -172,6 +188,18 @@
         }
     }
 
+    /**
+     * Attaches OnLongClickLister to fields LinearLayout that allow user copy the EditText text on
+     * long press.
+     */
+    private void setOnLongClickListenerOnContainer() {
+      mFields.setFocusable(true);
+      mFields.setLongClickable(true);
+      // Current legacy mimetypes support exactly 1 field
+      mFields.setTag(R.id.text_to_copy, mFieldEditTexts[0].getText().toString());
+      mFields.setOnLongClickListener(mOnLongClickListener);
+    }
+
     private OnFocusChangeListener mTextFocusChangeListener = new OnFocusChangeListener() {
         @Override
         public void onFocusChange(View v, boolean hasFocus) {
diff --git a/tests/src/com/android/contacts/ContactsUtilsTests.java b/tests/src/com/android/contacts/ContactsUtilsTests.java
index 114ce67..7c497eb 100644
--- a/tests/src/com/android/contacts/ContactsUtilsTests.java
+++ b/tests/src/com/android/contacts/ContactsUtilsTests.java
@@ -22,9 +22,10 @@
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
+import androidx.test.filters.SmallTest;
+
 import com.android.contacts.model.dataitem.DataItem;
 import com.android.contacts.model.dataitem.EmailDataItem;
 import com.android.contacts.model.dataitem.ImDataItem;
diff --git a/tests/src/com/android/contacts/DynamicShortcutsTests.java b/tests/src/com/android/contacts/DynamicShortcutsTests.java
index 199e2c9..8673c5e 100644
--- a/tests/src/com/android/contacts/DynamicShortcutsTests.java
+++ b/tests/src/com/android/contacts/DynamicShortcutsTests.java
@@ -38,9 +38,9 @@
 import android.provider.ContactsContract.Contacts;
 import android.test.AndroidTestCase;
 import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.test.mocks.MockContentProvider;
 
diff --git a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
index 4057ee8..179a51e 100644
--- a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
+++ b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
@@ -30,7 +30,8 @@
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.provider.ContactsContract.Data;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
+
+import androidx.test.filters.MediumTest;
 
 import com.android.contacts.model.account.AccountWithDataSet;
 
diff --git a/tests/src/com/android/contacts/MoreContactUtilsTest.java b/tests/src/com/android/contacts/MoreContactUtilsTest.java
index 6c9d541..3639e06 100644
--- a/tests/src/com/android/contacts/MoreContactUtilsTest.java
+++ b/tests/src/com/android/contacts/MoreContactUtilsTest.java
@@ -1,7 +1,8 @@
 package com.android.contacts;
 
 import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 4e57969..3d70f3f 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -25,7 +25,8 @@
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.ProviderStatus;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.ContactPhotoManager;
 import com.android.contacts.ContactsApplication;
diff --git a/tests/src/com/android/contacts/compat/CompatUtilsTest.java b/tests/src/com/android/contacts/compat/CompatUtilsTest.java
index 22694cb..d698ae7 100644
--- a/tests/src/com/android/contacts/compat/CompatUtilsTest.java
+++ b/tests/src/com/android/contacts/compat/CompatUtilsTest.java
@@ -17,7 +17,8 @@
 package com.android.contacts.compat;
 
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 @SmallTest
 public class CompatUtilsTest extends AndroidTestCase {
diff --git a/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
index 987882b..24feb0d 100644
--- a/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
+++ b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
@@ -21,7 +21,8 @@
 import android.test.InstrumentationTestCase;
 import android.test.mock.MockContentProvider;
 import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
index 9eea4d1..870f3b5 100644
--- a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
@@ -22,7 +22,8 @@
 import android.os.Build;
 import android.provider.Settings;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.R;
 import com.android.contacts.model.account.AccountDisplayInfo;
diff --git a/tests/src/com/android/contacts/format/FormatUtilsTests.java b/tests/src/com/android/contacts/format/FormatUtilsTests.java
index febed74..5c2d180 100644
--- a/tests/src/com/android/contacts/format/FormatUtilsTests.java
+++ b/tests/src/com/android/contacts/format/FormatUtilsTests.java
@@ -18,7 +18,8 @@
 
 import android.database.CharArrayBuffer;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 /**
  * Test cases for format utility methods.
diff --git a/tests/src/com/android/contacts/format/TextHighlighterTest.java b/tests/src/com/android/contacts/format/TextHighlighterTest.java
index 211d944..670cd0b 100644
--- a/tests/src/com/android/contacts/format/TextHighlighterTest.java
+++ b/tests/src/com/android/contacts/format/TextHighlighterTest.java
@@ -17,9 +17,10 @@
 package com.android.contacts.format;
 
 import android.graphics.Typeface;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.text.SpannableString;
 
+import androidx.test.filters.SmallTest;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/tests/src/com/android/contacts/group/GroupUtilTest.java b/tests/src/com/android/contacts/group/GroupUtilTest.java
index 5f72e9d..569979f 100644
--- a/tests/src/com/android/contacts/group/GroupUtilTest.java
+++ b/tests/src/com/android/contacts/group/GroupUtilTest.java
@@ -20,7 +20,8 @@
 import android.provider.ContactsContract.Contacts;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.list.ContactsSectionIndexer;
 
diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
index 258b818..0ad8d6d 100644
--- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
@@ -21,7 +21,8 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Contacts.Entity;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
+
+import androidx.test.filters.MediumTest;
 
 import com.android.contacts.ContactsApplication;
 import com.android.contacts.R;
diff --git a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
index 654533b..43efb6f 100644
--- a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
@@ -16,9 +16,8 @@
 package com.android.contacts.interactions;
 
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import java.util.Calendar;
-import java.util.Locale;
+
+import androidx.test.filters.SmallTest;
 
 /**
  * Tests for utility functions in {@link ContactInteractionUtil}
diff --git a/tests/src/com/android/contacts/list/ContactListItemViewTest.java b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
index 09c2f36..e36334d 100644
--- a/tests/src/com/android/contacts/list/ContactListItemViewTest.java
+++ b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
@@ -20,9 +20,10 @@
 import android.database.MatrixCursor;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.widget.TextView;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.contacts.format.SpannedTestUtils;
 import com.android.contacts.preference.ContactsPreferences;
 
diff --git a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
index dfcb390..1ccfd82 100644
--- a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
+++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
@@ -16,16 +16,20 @@
 
 package com.android.contacts.model;
 
+import static org.mockito.Mockito.when;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.SharedPreferences;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountTypeWithDataSet;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.model.account.GoogleAccountType;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -38,8 +42,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.mockito.Mockito.when;
-
 /**
  * Test case for {@link com.android.contacts.model.AccountTypeManager}.
  *
diff --git a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
index 7d6dfa3..6cac274 100644
--- a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
+++ b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
@@ -19,7 +19,8 @@
 import android.os.Bundle;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.model.account.AccountWithDataSet;
 
diff --git a/tests/src/com/android/contacts/model/ContactLoaderTest.java b/tests/src/com/android/contacts/model/ContactLoaderTest.java
index 8aa078b..37a33d8 100644
--- a/tests/src/com/android/contacts/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/model/ContactLoaderTest.java
@@ -27,7 +27,9 @@
 import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.StatusUpdates;
 import android.test.LoaderTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
+
+import androidx.test.filters.LargeTest;
+
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
@@ -37,11 +39,14 @@
 import com.android.contacts.test.mocks.MockContentProvider;
 import com.android.contacts.testing.InjectedServices;
 import com.android.contacts.util.Constants;
+
 import com.google.common.collect.Lists;
-import java.util.List;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 /**
  * Runs ContactLoader tests for the the contact-detail and editor view.
  */
diff --git a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
index d9ff184..9853870 100644
--- a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
@@ -29,7 +29,8 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
+
+import androidx.test.filters.LargeTest;
 
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.model.account.AccountType;
diff --git a/tests/src/com/android/contacts/model/RawContactDeltaTests.java b/tests/src/com/android/contacts/model/RawContactDeltaTests.java
index f5d4181..4c2c174 100644
--- a/tests/src/com/android/contacts/model/RawContactDeltaTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaTests.java
@@ -25,7 +25,8 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
+
+import androidx.test.filters.LargeTest;
 
 import com.android.contacts.compat.CompatUtils;
 
diff --git a/tests/src/com/android/contacts/model/RawContactModifierTests.java b/tests/src/com/android/contacts/model/RawContactModifierTests.java
index 594bb44..3cf1224 100644
--- a/tests/src/com/android/contacts/model/RawContactModifierTests.java
+++ b/tests/src/com/android/contacts/model/RawContactModifierTests.java
@@ -30,7 +30,8 @@
 import android.provider.ContactsContract.Intents.Insert;
 import android.provider.ContactsContract.RawContacts;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
+
+import androidx.test.filters.LargeTest;
 
 import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
diff --git a/tests/src/com/android/contacts/model/RawContactTest.java b/tests/src/com/android/contacts/model/RawContactTest.java
index d9f05c9..9af655c 100644
--- a/tests/src/com/android/contacts/model/RawContactTest.java
+++ b/tests/src/com/android/contacts/model/RawContactTest.java
@@ -20,7 +20,8 @@
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/com/android/contacts/model/ValuesDeltaTests.java b/tests/src/com/android/contacts/model/ValuesDeltaTests.java
index b7161d7..f8febd7 100644
--- a/tests/src/com/android/contacts/model/ValuesDeltaTests.java
+++ b/tests/src/com/android/contacts/model/ValuesDeltaTests.java
@@ -21,7 +21,8 @@
 import android.os.Build;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Data;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.compat.CompatUtils;
 
diff --git a/tests/src/com/android/contacts/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
index 7c74b21..b9a11ee 100644
--- a/tests/src/com/android/contacts/model/account/AccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
@@ -18,7 +18,8 @@
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.tests.R;
 
diff --git a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
index 17d815e..71b01f3 100644
--- a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
@@ -29,11 +29,12 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
 
-import com.android.contacts.tests.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
+
 import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.tests.R;
 
 import com.google.common.base.Objects;
 
diff --git a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
index 4b76d0c..f169e29 100644
--- a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
+++ b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
@@ -30,11 +30,14 @@
 import android.provider.ContactsContract.CommonDataKinds.Website;
 import android.provider.ContactsContract.Contacts.Data;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
+
 import com.android.contacts.Collapser;
 import com.android.contacts.model.account.AccountType.EditType;
 import com.android.contacts.model.account.BaseAccountType;
 import com.android.contacts.model.account.GoogleAccountType;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
index d7f34ee..d2fd13e 100644
--- a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
+++ b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
@@ -20,9 +20,9 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.model.account.AccountWithDataSet;
 
diff --git a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
index ca6d165..be27bcf 100644
--- a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
+++ b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
@@ -20,7 +20,8 @@
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountDisplayInfo;
diff --git a/tests/src/com/android/contacts/util/BitmapUtilTests.java b/tests/src/com/android/contacts/util/BitmapUtilTests.java
index ee7ebc0..ffbc170 100644
--- a/tests/src/com/android/contacts/util/BitmapUtilTests.java
+++ b/tests/src/com/android/contacts/util/BitmapUtilTests.java
@@ -18,7 +18,8 @@
 
 import android.graphics.Bitmap;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
index 1503215..3f4dc6c 100644
--- a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
+++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
@@ -19,7 +19,8 @@
 import static android.provider.ContactsContract.CommonDataKinds.Phone;
 
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import com.android.contacts.R;
 import com.android.contacts.preference.ContactsPreferences;
diff --git a/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java b/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java
index d17b98c..8a01c31 100644
--- a/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java
+++ b/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java
@@ -2,7 +2,8 @@
 
 import android.net.Uri;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 /**
  * Test cases for {@link ContactPhotoUtils}.
diff --git a/tests/src/com/android/contacts/util/SearchUtilTest.java b/tests/src/com/android/contacts/util/SearchUtilTest.java
index e2156ca..f957a6a 100644
--- a/tests/src/com/android/contacts/util/SearchUtilTest.java
+++ b/tests/src/com/android/contacts/util/SearchUtilTest.java
@@ -16,7 +16,7 @@
 
 package com.android.contacts.util;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/com/android/contacts/util/SyncUtilTests.java b/tests/src/com/android/contacts/util/SyncUtilTests.java
index 508ff04..b8c8dae 100644
--- a/tests/src/com/android/contacts/util/SyncUtilTests.java
+++ b/tests/src/com/android/contacts/util/SyncUtilTests.java
@@ -17,7 +17,8 @@
 
 import android.accounts.Account;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 /**
  * Tests for SyncUtil.
diff --git a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
index a46a17c..306aa45 100644
--- a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
+++ b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
@@ -18,11 +18,12 @@
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
+import androidx.test.filters.SmallTest;
+
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;