diff --git a/src/com/android/phone/ADNList.java b/src/com/android/phone/ADNList.java
index b1cb16b..18b48fa 100644
--- a/src/com/android/phone/ADNList.java
+++ b/src/com/android/phone/ADNList.java
@@ -22,12 +22,10 @@
 import android.app.ListActivity;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.util.Log;
diff --git a/src/com/android/phone/CLIRListPreference.java b/src/com/android/phone/CLIRListPreference.java
index f5d14b8..b3ff171 100644
--- a/src/com/android/phone/CLIRListPreference.java
+++ b/src/com/android/phone/CLIRListPreference.java
@@ -1,19 +1,19 @@
 package com.android.phone;
 
 import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
 
 import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Parcelable;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
+
 /**
  * {@link ListPreference} for CLIR (Calling Line Identification Restriction).
  * Right now this is used for "Caller ID" setting.
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 8a82e05..f676371 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -1,9 +1,7 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CallForwardInfo;
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
+import static com.android.phone.TimeConsumingPreferenceActivity.EXCEPTION_ERROR;
+import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -24,8 +22,10 @@
 import android.util.Log;
 import android.view.View;
 
-import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
-import static com.android.phone.TimeConsumingPreferenceActivity.EXCEPTION_ERROR;
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
 
 public class CallForwardEditPreference extends EditPhoneNumberPreference {
     private static final String LOG_TAG = "CallForwardEditPreference";
diff --git a/src/com/android/phone/CallLogger.java b/src/com/android/phone/CallLogger.java
index 27dbec4..60a2590 100644
--- a/src/com/android/phone/CallLogger.java
+++ b/src/com/android/phone/CallLogger.java
@@ -16,13 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.CallerInfo;
-import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyCapabilities;
-import com.android.phone.common.CallLogAsync;
-
 import android.net.Uri;
 import android.os.SystemProperties;
 import android.provider.CallLog.Calls;
@@ -31,6 +24,13 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.telephony.CallerInfo;
+import com.android.internal.telephony.Connection;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.TelephonyCapabilities;
+import com.android.phone.common.CallLogAsync;
+
 /**
  * Helper class for interacting with the call log.
  */
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index ec670f5..3657d14 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -16,14 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.CallManager;
-
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
-import com.android.internal.telephony.cdma.SignalToneUtil;
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothProfile;
@@ -35,7 +27,6 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.telecom.TelecomManager;
-
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -44,15 +35,20 @@
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.internal.telephony.CallManager;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.SubscriptionController;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
+import com.android.internal.telephony.cdma.SignalToneUtil;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import com.android.internal.telephony.SubscriptionController;
-
 /**
  * Phone app module that listens for phone state changes and various other
  * events from the telephony layer, and triggers any resulting UI behavior
diff --git a/src/com/android/phone/CallTime.java b/src/com/android/phone/CallTime.java
index 92c7972..a870ea6 100644
--- a/src/com/android/phone/CallTime.java
+++ b/src/com/android/phone/CallTime.java
@@ -20,9 +20,10 @@
 import android.os.Debug;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.util.Log;
+
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.Connection;
-import android.util.Log;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/com/android/phone/CallWaitingSwitchPreference.java b/src/com/android/phone/CallWaitingSwitchPreference.java
index 3f248ae..41442fe 100644
--- a/src/com/android/phone/CallWaitingSwitchPreference.java
+++ b/src/com/android/phone/CallWaitingSwitchPreference.java
@@ -1,8 +1,5 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.Phone;
-
 import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
 
 import android.content.Context;
@@ -13,6 +10,9 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.Phone;
+
 public class CallWaitingSwitchPreference extends SwitchPreference {
     private static final String LOG_TAG = "CallWaitingSwitchPreference";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/CallerInfoCache.java b/src/com/android/phone/CallerInfoCache.java
index 644aa22..2707c7c 100644
--- a/src/com/android/phone/CallerInfoCache.java
+++ b/src/com/android/phone/CallerInfoCache.java
@@ -16,14 +16,10 @@
 
 package com.android.phone;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index bbd0069..acfa496 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -16,23 +16,17 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-
-import android.content.DialogInterface;
-import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.PersistableBundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.telephony.CarrierConfigManager;
-import android.util.Log;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.PhoneConstants;
+
 public class CdmaCallOptions extends PreferenceActivity {
     private static final String LOG_TAG = "CdmaCallOptions";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/CdmaSubscriptionListPreference.java b/src/com/android/phone/CdmaSubscriptionListPreference.java
index 49f4678..4a32dc4 100644
--- a/src/com/android/phone/CdmaSubscriptionListPreference.java
+++ b/src/com/android/phone/CdmaSubscriptionListPreference.java
@@ -23,7 +23,6 @@
 import android.os.Message;
 import android.preference.ListPreference;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
 import android.util.AttributeSet;
 import android.util.Log;
 
diff --git a/src/com/android/phone/CdmaSystemSelectListPreference.java b/src/com/android/phone/CdmaSystemSelectListPreference.java
index ca2bc02..9c24aa7 100644
--- a/src/com/android/phone/CdmaSystemSelectListPreference.java
+++ b/src/com/android/phone/CdmaSystemSelectListPreference.java
@@ -19,17 +19,14 @@
 import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.ListPreference;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
 import android.util.AttributeSet;
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.TelephonyProperties;
 
 public class CdmaSystemSelectListPreference extends ListPreference {
 
diff --git a/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
index 5a99bb7..b79a3f0 100644
--- a/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
+++ b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
@@ -16,8 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.Phone;
-
 import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Handler;
@@ -26,6 +24,8 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.Phone;
+
 public class CdmaVoicePrivacySwitchPreference extends SwitchPreference {
     private static final String LOG_TAG = "CdmaVoicePrivacySwitchPreference";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/FakePhoneActivity.java b/src/com/android/phone/FakePhoneActivity.java
index 686a766..34b7197 100644
--- a/src/com/android/phone/FakePhoneActivity.java
+++ b/src/com/android/phone/FakePhoneActivity.java
@@ -19,14 +19,15 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.os.Bundle;
-import com.android.internal.telephony.test.SimulatedRadioControl;
 import android.util.Log;
-import android.view.View.OnClickListener;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.android.internal.telephony.test.SimulatedRadioControl;
+
 /**
  * A simple activity that presents you with a UI for faking incoming phone operations.
  */
diff --git a/src/com/android/phone/GsmUmtsCallForwardOptions.java b/src/com/android/phone/GsmUmtsCallForwardOptions.java
index 77cc6cc..ab2f914 100644
--- a/src/com/android/phone/GsmUmtsCallForwardOptions.java
+++ b/src/com/android/phone/GsmUmtsCallForwardOptions.java
@@ -1,9 +1,5 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CallForwardInfo;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
-
 import android.app.ActionBar;
 import android.content.Intent;
 import android.database.Cursor;
@@ -14,6 +10,10 @@
 import android.util.Log;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
+
 import java.util.ArrayList;
 
 
diff --git a/src/com/android/phone/GsmUmtsCallOptions.java b/src/com/android/phone/GsmUmtsCallOptions.java
index 3b27d28..5358db9 100644
--- a/src/com/android/phone/GsmUmtsCallOptions.java
+++ b/src/com/android/phone/GsmUmtsCallOptions.java
@@ -18,14 +18,12 @@
 
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.view.MenuItem;
 
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 
 public class GsmUmtsCallOptions extends PreferenceActivity {
diff --git a/src/com/android/phone/IccPanel.java b/src/com/android/phone/IccPanel.java
index e603a06..be182233 100644
--- a/src/com/android/phone/IccPanel.java
+++ b/src/com/android/phone/IccPanel.java
@@ -19,11 +19,11 @@
 import android.app.Dialog;
 import android.app.StatusBarManager;
 import android.content.Context;
+import android.os.Bundle;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.WindowManager;
 import android.view.Window;
-import android.os.Bundle;
+import android.view.WindowManager;
 
 /**
  * Base class for ICC-related panels in the Phone UI.
diff --git a/src/com/android/phone/ImsUtil.java b/src/com/android/phone/ImsUtil.java
index 4d8ff80..3104853 100644
--- a/src/com/android/phone/ImsUtil.java
+++ b/src/com/android/phone/ImsUtil.java
@@ -25,7 +25,6 @@
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
-import com.android.phone.PhoneGlobals;
 
 public class ImsUtil {
     private static final String LOG_TAG = ImsUtil.class.getSimpleName();
diff --git a/src/com/android/phone/PhoneApp.java b/src/com/android/phone/PhoneApp.java
index bf30d58..f16d8ce 100644
--- a/src/com/android/phone/PhoneApp.java
+++ b/src/com/android/phone/PhoneApp.java
@@ -17,7 +17,6 @@
 package com.android.phone;
 
 import android.app.Application;
-import android.content.res.Configuration;
 import android.os.UserHandle;
 
 import com.android.services.telephony.TelephonyGlobals;
diff --git a/src/com/android/phone/PhoneSearchIndexablesProvider.java b/src/com/android/phone/PhoneSearchIndexablesProvider.java
index ee79f92..57a5b8a 100644
--- a/src/com/android/phone/PhoneSearchIndexablesProvider.java
+++ b/src/com/android/phone/PhoneSearchIndexablesProvider.java
@@ -36,9 +36,10 @@
 import android.provider.SearchIndexableResource;
 import android.provider.SearchIndexablesContract.RawData;
 import android.provider.SearchIndexablesProvider;
-import android.support.annotation.VisibleForTesting;
 import android.telephony.euicc.EuiccManager;
 
+import androidx.annotation.VisibleForTesting;
+
 public class PhoneSearchIndexablesProvider extends SearchIndexablesProvider {
     private static final String TAG = "PhoneSearchIndexablesProvider";
     private UserManager mUserManager;
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index f668917..4229482 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -41,7 +41,6 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.telecom.PhoneAccount;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 3c02a30..5a5d488 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -19,19 +19,14 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.provider.Settings;
-
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.Phone;
-
 import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
diff --git a/src/com/android/phone/TelephonyDebugService.java b/src/com/android/phone/TelephonyDebugService.java
index fe17633..da66994 100644
--- a/src/com/android/phone/TelephonyDebugService.java
+++ b/src/com/android/phone/TelephonyDebugService.java
@@ -16,13 +16,13 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.DebugService;
-
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
+import com.android.internal.telephony.DebugService;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 
diff --git a/src/com/android/phone/otasp/OtaspActivationService.java b/src/com/android/phone/otasp/OtaspActivationService.java
index 158925a..c41640c 100644
--- a/src/com/android/phone/otasp/OtaspActivationService.java
+++ b/src/com/android/phone/otasp/OtaspActivationService.java
@@ -15,6 +15,8 @@
  */
 package com.android.phone.otasp;
 
+import static com.android.phone.PhoneGlobals.getPhone;
+
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -31,8 +33,6 @@
 import com.android.phone.PhoneGlobals;
 import com.android.phone.PhoneUtils;
 
-import static com.android.phone.PhoneGlobals.getPhone;
-
 /**
  * otasp activation service handles all logic related with OTASP call.
  * OTASP is a CDMA-specific feature: OTA or OTASP == Over The Air service provisioning
diff --git a/src/com/android/phone/otasp/OtaspSimStateReceiver.java b/src/com/android/phone/otasp/OtaspSimStateReceiver.java
index 213aa9f..78f7baf 100644
--- a/src/com/android/phone/otasp/OtaspSimStateReceiver.java
+++ b/src/com/android/phone/otasp/OtaspSimStateReceiver.java
@@ -23,6 +23,7 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+
 import com.android.internal.telephony.Phone;
 import com.android.phone.PhoneGlobals;
 
diff --git a/src/com/android/phone/settings/AccountSelectionPreference.java b/src/com/android/phone/settings/AccountSelectionPreference.java
index 58072d9..be4f3a0 100644
--- a/src/com/android/phone/settings/AccountSelectionPreference.java
+++ b/src/com/android/phone/settings/AccountSelectionPreference.java
@@ -16,14 +16,9 @@
 
 package com.android.phone.settings;
 
-import com.android.phone.R;
-
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.UserHandle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.telecom.PhoneAccount;
@@ -32,6 +27,8 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import com.android.phone.R;
+
 import java.util.List;
 import java.util.Objects;
 
diff --git a/src/com/android/phone/settings/VoicemailProviderListPreference.java b/src/com/android/phone/settings/VoicemailProviderListPreference.java
index d9f1a55..b906ca9 100644
--- a/src/com/android/phone/settings/VoicemailProviderListPreference.java
+++ b/src/com/android/phone/settings/VoicemailProviderListPreference.java
@@ -18,13 +18,10 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.database.Cursor;
 import android.preference.ListPreference;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 74b8e4e..5f317c3 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -29,7 +29,6 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
index af45ba8..d03dc7a 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Bystandoproep"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Voorspel en voeg \'n landskode by wanneer jy bel terwyl jy oorsee reis"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
index 51d79e1..68641f2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"የታገዘ መደወያ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ወደ ውጭ አገር በመጓዝ ላይ እያሉ በሚደውሉ ጊዜ የአገር ኮድን ይተንብዩና ያክሉ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
index 09453a7..aecb69f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"الطلب المساعد"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"توقُع رمز البلد وإضافته عند إجراء مكالمة أثناء السفر خارج البلاد"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
index 669c69c..65e3ec3 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Dəstəkli nömrə yığımı"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Xaricə səyahət edərkən ölkə kodunu bildirin və ya əlavə edin"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
index 2452950..62a2557 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidi i dodaj pozivni broj za zemlju kad upućujem pozive iz inostranstva"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
index 96f3cdc..bc4a7c0 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Памочнік набору"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Прадказваць і дадаваць код краіны, калі вы робіце выклік падчас падарожжа за мяжой"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
index 70d1677..9e86d98 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Подпомогнато набиране"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиждане и добавяне на код на държавата, когато пътувате в чужбина"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
index 5b2d52f..96e0253 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"সহায়তা যুক্ত ডায়ালিং"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"বিদেশে থেকে কল করলে দেশের কোড অনুমান করে সেটি যোগ করুন"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
index d0af41b..67a1dde 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predviđanje i dodavanje pozivnog broja zemlje prilikom pozivanja iz inostranstva"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
index abc663a..e2bc551 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcatge assistit"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predigues i afegeix un codi de país en les trucades des de l\'estranger"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
index 643aaee..2fc61bc 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asistované vytáčení"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Při volání v zahraničí odhadnout a přidat předvolbu země"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
index 0712eee..bfaebb7 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisteret opkald"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Forudsig og tilføj en landekode, når du foretager et opkald, mens du er udenlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
index 21746b4..76ebe3f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Unterstützung für Nummerneingabe"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Hiermit wird eine Landesvorwahl vorgeschlagen und bei deinen Anrufen hinzugefügt, wenn du im Ausland unterwegs bist"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
index 720f672..bbd8c63 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Υποβοηθούμενη κλήση"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Προβλέψτε και προσθέστε έναν κωδικό χώρας όταν καλείτε ενόσω ταξιδεύετε στο εξωτερικό"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
index 6709101..51f73ab 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎Assisted dialing‎‏‎‎‏‎"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎Predict and add a country code when you call while traveling abroad‎‏‎‎‏‎"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
index 1303b95..1ce18d8 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcado asistido"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predecir el código del país y agregarlo cuando se realicen llamadas desde el exterior"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
index db01a9b..759ae97 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcación asistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predecir y añadir un código de país al llamar desde el extranjero"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
index 1fb1f3c..34743b7 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Abistatud helistamine"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Määra ja lisa välismaal reisimise ajal helistades"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
index e2489ba..84e5d4e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Lagundutako markatzea"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Iragarri eta gehitu herrialde-kodea atzerritik deitzean"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
index ac5743d..c04b1e1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"شماره‌گیری کمکی"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"پیش‌بینی و افزودن کد کشور وقتی در سفر خارجی تماس برقرار می‌کنید"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
index c7b56cb..c473f19 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Avustettu soittaminen"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Etsi ja lisää maakoodi ulkomailta soitettavia puheluita varten"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
index e97951b..9bc48ad 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numérotation assistée"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prédire et ajouter un code de pays lorsque vous faites un appel lors d\'un voyage à l\'étranger"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
index c863baf..a38adf2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numérotation assistée"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Depuis l\'étranger, détecter le pays de destination de l\'appel et ajouter l\'indicatif correspondant"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
index 5378b2f..6411af9 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcación asistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Cando chamas desde o estranxeiro, detecta o país ao que estás chamando e engade o seu prefixo"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
index d062a70..007bdec 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"સહાયિત ડાયલિંગ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"વિદેશમાં મુસાફરી કરતી વખતે જ્યારે તમે કૉલ કરો, ત્યારે દેશના કોડનું અનુમાન લગાવીને તેને ઉમેરો"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
index 127a7f7..8eabc0c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"सहायक डायलिंग"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"विदेश यात्रा के दौरान कॉल करते समय पूर्वानुमान की मदद से देश कोड जोड़ें"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
index 46f14f1..7ceaf24 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidite i dodajte pozivni broj zemlje kada putujete u inozemstvo."</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
index 0253604..a19d316 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Támogatott tárcsázás"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Országhívószámok előrejelzése és hozzáadása külföldről indított híváskor"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
index 5ed7979..46fb7f2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Օգնություն համարհավաքման ժամանակ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Արտասահմանում գտնվելու ժամանակ զանգելիս երկրի կոդի կանխագուշակում և ավելացում"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
index b8a9840..d357a2c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Panggilan Berbantu"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prediksi dan tambahkan kode negara saat menelepon dari luar negeri"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
index 2d5bb15..f2e8247 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Aðstoð við hringingar"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Bæta réttum landskóða við hringd símtöl þegar þú ferðast erlendis"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
index 40c4760..f4fe19f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Composizione assistita"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prevedi e aggiungi il prefisso internazionale quando effettui chiamate mentre ti trovi all\'estero"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
index e130fc7..ff2e7fd 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"עזרה בחיוג"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"חיזוי והוספה של קידומת החיוג למדינה כשמתקשרים מחו\"ל"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
index 413dfec..ee93bad 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ダイヤル アシスト"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"渡航先から通話を発信する際に、国コードの候補を自動的に追加"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
index 285cf44..3c804ce 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"დახმარება ნომრის აკრეფაში"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ქვეყნის კოდის პროგნოზირება და დამატება საზღვარგარეთ მგზავრობის დროს დარეკვისას"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
index 461137f..73c5545 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Көмекпен теру"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Шетелге сапар барысында қоңырау шалу үшін ел кодын анықтау және қосу"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
index c035fbd..367f712 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ការហៅទូរសព្ទ​ដោយ​មាន​ជំនួយ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ទស្សន៍ទាយ និង​បញ្ចូល​កូដ​ប្រទេស នៅពេល​អ្នក​ហៅ​ទូរសព្ទ ពេល​ធ្វើ​ដំណើរ​ក្រៅ​ប្រទេស"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
index dc06c16..7e18769 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ಸಹಾಯಕ ಡಯಲಿಂಗ್"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಕರೆ ಮಾಡುವಾಗ ದೇಶದ ಕೋಡ್ ಅನ್ನು ಅಂದಾಜಿಸಿ ಮತ್ತು ಅದನ್ನು ಸೇರಿಸಿ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
index 305d2b5..c7587db 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"전화번호 도우미"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"해외여행 중 전화를 걸면 국가 코드를 예측하여 추가"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
index 8a4840e..5ecc7e6 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Жардам берилген терүү"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Чет өлкөдө саякаттап жүрүп, бирөөгө чалканда өлкө кодун алдын ала айтып, кошот"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
index a6eb778..3083bf1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ກ່ອງຂໍ້ຄວາມແບບຊ່ວຍເຫຼືອ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ຄາດເດົາ ແລະ ເພີ່ມລະຫັດປະເທດເມື່ອທ່ານໂທໃນລະຫວ່າງເດີນທາງຢູ່ຕ່າງປະເທດ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
index d55b5ec..e9123aa 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Pagalbinis numerio rinkimas"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Numatyti ir pridėti šalies kodą, kai skambinama keliaujant užsienyje"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
index 634c2d6..6e1eb87 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numura sastādīšanas palīdzība"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prognozēt un pievienot valsts kodu, kad jūs zvanāt, atrodoties ārzemēs"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
index 3c4d6b4..4638cdb 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Бирање со помош"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиди и додај код на земја кога повикувам додека патувам во странство"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
index f810dd8..6253c15 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"അസിസ്‌റ്റഡ് ഡയലിംഗ്"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"വിദേശ യാത്രക്കിടയിൽ കോൾ ചെയ്യുമ്പോൾ രാജ്യത്തിന്റെ കോഡ് കണ്ടെത്തി നൽകുക"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
index a723ff6..7af3d2d 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Тусламжтай залгах"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Таныг гадаад оронд аялж байх үед урьдчилан таамаглаж улсын кодыг нэмнэ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
index c8269f4..a58e97b 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"साहाय्यक डायलिंग"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"परदेशात प्रवास करत असताना, एखाद्या देशाच्या कोडचा अंदाज लावा आणि तो जोडा"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
index 3d2d169..b7fd6ee 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Pendailan berbantu"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Ramalkan dan tambahkan kod negara apabila anda membuat panggilan semasa melancong ke luar negara"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
index f28d54b..b55cc4e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"အထောက်အကူပြု ဖုန်းခေါ်ဆိုခြင်း"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ပြည်ပခရီးသွားနေစဉ် ဖုန်းခေါ်ဆိုပါက နိုင်ငံကုဒ်ကို ခန့်မှန်းပြီး ထည့်ရန်"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
index 45a981e..cd4c265 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Hjelp med å slå numre"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Forutsi og legg til landkode når du ringer mens du er utenlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
index a2cc899..f8661f9 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"सहायताप्राप्त डायल गर्ने सुविधा"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"विदेश यात्राको बेला कल गर्दा पूर्वानुमान सुविधाको प्रयोग गरी कुनै देशको कोड थप्नुहोस्"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
index 0a4b1ea..a24f893 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Ondersteund bellen"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Een landcode voorspellen en toevoegen wanneer je belt terwijl je in het buitenland bent"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
index 5cfd6e8..f8dba6e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ਸਹਾਇਕ ਡਾਇਲਿੰਗ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ਵਿਦੇਸ਼ ਯਾਤਰਾ ਦੌਰਾਨ ਕਾਲ ਕਰਨ ਸਮੇਂ ਅੰਦਾਜ਼ਾ ਲਗਾਓ ਅਤੇ ਇੱਕ ਦੇਸ਼ ਕੋਡ ਸ਼ਾਮਲ ਕਰੋ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
index 276e405..b192191 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asystent wybierania numeru"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Przewiduj i dodawaj kod kraju, gdy dzwonisz podczas pobytu za granicą"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
index c163d5a..6f233de 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcação assistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prever e adicionar um código de país ao efetuar uma chamada durante uma viagem ao estrangeiro"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
index 65f0041..71a8b0b 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Discagem assistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prever e adicionar um código de país nas chamadas feitas no exterior"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
index 0e1e395..36de962 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Apelare asistată"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Sugerați și adăugați un prefix de țară când apelați din străinătate"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
index 04f8c13..e89f722 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Набор номера с подсказками"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Подсказывать и добавлять код страны при совершении звонков в поездках за границу"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
index 4d8c7cf..f5169e2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"සහායක ඇමතීම"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ඔබ පිටරට සංචාරය කරන අතරතුර ඇමතීමේදී රටේ කේතය පුරෝකථනය කරන්න සහ එක් කරන්න"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
index 9ce564b..6ed9e34 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asistované vytáčanie"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Pri volaní v zahraničí odhadnúť a pridať predvoľbu krajiny"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
index b47e893..72e1296 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Klicanje s pomočjo"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidi in dodaj kodo države pri klicih med potovanjem v tujini"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
index 1b5216d..044a552 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Telefonimi i ndihmuar"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Parashiko dhe shto një kod shteti kur telefonon gjatë udhëtimeve jashtë shtetit"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
index a94ae1d..101337e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Потпомогнуто бирање"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиди и додај позивни број за земљу кад упућујем позиве из иностранства"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
index 5658198..4863d94 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisterad uppringning"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Föreslå och lägg till landskod när du ringer utomlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
index 5d35627..9f9c036 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Upigaji simu unaosaidiwa"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Tabiri na uongeze nambari ya nchi wakati unapiga simu ukiwa unasafiri nje ya nchi"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
index a274319..e0fdda1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"அழைப்பை மேற்கொள்வதற்கான உதவி"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"வெளிநாட்டிற்குப் பயணிக்கும் போது, பிறரை அழைத்தால் அந்த நாட்டின் தேசக் குறியீட்டைக் கணித்து, சேர்"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
index 716a33e..fe110f4 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"సహాయక డయలింగ్"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"మీరు విదేశాల్లో ప్రయాణిస్తున్నప్పుడు కాల్ చేసేటప్పుడు దేశం కోడ్‌ని ఊహించి, జోడించండి"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
index e0bc91d..18121a1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ระบบช่วยโทรออก"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"คาดเดาและเพิ่มรหัสประเทศให้เมื่อคุณโทรศัพท์ขณะอยู่ต่างประเทศ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
index a6781c2..00c2726 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Tinutulungan na pag-dial"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Hulaan at magdagdag ng code ng bansa kapag tumatawag ka habang naglalakbay sa ibang bansa"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
index daa9dbe..737cc61 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Yardımlı arama"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Yurt dışı seyahatiniz sırasında telefon ederken ülke kodu tahmin edilip eklenir"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
index 3b112fa..f0ea120 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Помічник набору"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Передбачення й додавання коду країни, коли ви телефонуєте з-за кордону"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
index fe1724a..ee302fa 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"معاون ڈائلنگ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"بیرون ملک سفر کرتے وقت جب آپ کال کریں تو ملکی کوڈ کی پیشنگوئی کریں اور شامل کریں"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
index cfa42ce..0d4fe2f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Bildirgi asosida raqam terish"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Chet elda chaqiruvlarni amalga oshirishda mamlakat kodi avtomatik aniqlansin va kiritilsin"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
index ce54c37..d7b6966 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Quay số được hỗ trợ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Dự đoán và thêm mã quốc gia khi bạn gọi trong khi đi du lịch nước ngoài"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
index b113adf..8abae34 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"辅助拨号"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"当您在国外的旅途中拨打电话时，预测并添加国家/地区代码"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
index e89bffe..744e957 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"輔助撥號"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"在國外撥打電話時預測並新增國家/地區代碼"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
index 343dfe5..f89fe9c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"輔助撥號"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"從其他國家/地區打電話時，自動預測並新增國家/地區代碼"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
index 2b20315..4ce9729 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Ukushaya okusizwayo"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Qagela futhi ungeze ikhodi yezwe uma ushaya ngenkathi uya ngaphesheya"</string>
diff --git a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
index fa32a25..92baa97 100644
--- a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
@@ -16,6 +16,9 @@
 
 package com.android.phone.settings.fdn;
 
+import static android.view.Window.PROGRESS_VISIBILITY_OFF;
+import static android.view.Window.PROGRESS_VISIBILITY_ON;
+
 import android.app.Activity;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
@@ -33,9 +36,6 @@
 import com.android.phone.R;
 import com.android.phone.SubscriptionInfoHelper;
 
-import static android.view.Window.PROGRESS_VISIBILITY_OFF;
-import static android.view.Window.PROGRESS_VISIBILITY_ON;
-
 /**
  * Activity to let the user delete an FDN contact.
  */
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index 921e947..c358e27 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -29,8 +29,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Contacts.PeopleColumns;
-import android.provider.Contacts.PhonesColumns;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
@@ -50,10 +48,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.telephony.PhoneFactory;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.R;
 import com.android.phone.SubscriptionInfoHelper;
-import com.android.internal.telephony.PhoneFactory;
 
 /**
  * Activity to let the user add or edit an FDN contact.
diff --git a/src/com/android/phone/settings/fdn/EditPinPreference.java b/src/com/android/phone/settings/fdn/EditPinPreference.java
index 42fc418..9596f39 100644
--- a/src/com/android/phone/settings/fdn/EditPinPreference.java
+++ b/src/com/android/phone/settings/fdn/EditPinPreference.java
@@ -20,16 +20,11 @@
 import android.content.Context;
 import android.preference.EditTextPreference;
 import android.text.InputType;
-import android.text.method.DigitsKeyListener;
-import android.text.method.PasswordTransformationMethod;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.EditText;
 
 import com.android.phone.R;
 
-import java.util.Map;
-
 /**
  * Class similar to the com.android.settings.EditPinPreference
  * class, with a couple of modifications, including a different layout
diff --git a/src/com/android/phone/settings/fdn/FdnList.java b/src/com/android/phone/settings/fdn/FdnList.java
index 61a8299..c2ecbc6 100644
--- a/src/com/android/phone/settings/fdn/FdnList.java
+++ b/src/com/android/phone/settings/fdn/FdnList.java
@@ -33,7 +33,6 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import com.android.phone.ADNList;
 import com.android.phone.PhoneGlobals;
diff --git a/src/com/android/phone/settings/fdn/FdnSetting.java b/src/com/android/phone/settings/fdn/FdnSetting.java
index c76f91d..8b5afa4 100644
--- a/src/com/android/phone/settings/fdn/FdnSetting.java
+++ b/src/com/android/phone/settings/fdn/FdnSetting.java
@@ -23,9 +23,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.WindowManager;
 import android.widget.Toast;
diff --git a/src/com/android/phone/vvm/PhoneAccountHandleConverter.java b/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
index cb05215..7e9d74b 100644
--- a/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
+++ b/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
@@ -19,10 +19,10 @@
 import android.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.SubscriptionManager;
+
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.phone.PhoneUtils;
-import com.android.phone.vvm.VvmLog;
 
 /**
  * Utility to convert between PhoneAccountHandle and subId, which is a common operation in OMTP
diff --git a/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java b/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
index ecd1f0f..75e50af 100644
--- a/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
+++ b/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
@@ -23,8 +23,6 @@
 import android.telephony.VisualVoicemailSmsFilterSettings;
 import android.util.ArraySet;
 
-import com.android.phone.vvm.RemoteVvmTaskManager;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/src/com/android/services/telephony/CdmaConferenceController.java b/src/com/android/services/telephony/CdmaConferenceController.java
index 846df61..24c3870 100644
--- a/src/com/android/services/telephony/CdmaConferenceController.java
+++ b/src/com/android/services/telephony/CdmaConferenceController.java
@@ -16,13 +16,13 @@
 
 package com.android.services.telephony;
 
-import com.android.phone.PhoneUtils;
-
 import android.os.Handler;
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccountHandle;
 
+import com.android.phone.PhoneUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index ffa9dbc..791831a 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -18,7 +18,6 @@
 
 import android.os.Handler;
 import android.os.Message;
-
 import android.provider.Settings;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
@@ -26,8 +25,8 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.phone.settings.SettingsConstants;
 
 import java.util.LinkedList;
diff --git a/src/com/android/services/telephony/ConferenceParticipantConnection.java b/src/com/android/services/telephony/ConferenceParticipantConnection.java
index 19dda54..bbddbdf 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -16,19 +16,19 @@
 
 package com.android.services.telephony;
 
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-
 import android.net.Uri;
-import android.telecom.Connection;
 import android.telecom.ConferenceParticipant;
+import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;
 
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+
 /**
  * Represents a participant in a conference call.
  */
diff --git a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
index e557919..b9cbf6e 100644
--- a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
+++ b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
@@ -19,13 +19,9 @@
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
 
 import com.android.internal.telephony.Phone;
 import com.android.internal.util.Preconditions;
-import com.android.phone.PhoneUtils;
 
 /**
  * Listens to phone's capabilities changed event and notifies Telecomm. One instance of these exists
diff --git a/src/com/android/services/telephony/RadioOnHelper.java b/src/com/android/services/telephony/RadioOnHelper.java
index daa7665..cd08289 100644
--- a/src/com/android/services/telephony/RadioOnHelper.java
+++ b/src/com/android/services/telephony/RadioOnHelper.java
@@ -26,7 +26,6 @@
 import com.android.internal.telephony.PhoneFactory;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 
 /**
diff --git a/src/com/android/services/telephony/TelephonyConferenceController.java b/src/com/android/services/telephony/TelephonyConferenceController.java
index acb41f6..e96815c 100644
--- a/src/com/android/services/telephony/TelephonyConferenceController.java
+++ b/src/com/android/services/telephony/TelephonyConferenceController.java
@@ -16,26 +16,22 @@
 
 package com.android.services.telephony;
 
+import android.telecom.Conference;
+import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccountHandle;
+
+import com.android.internal.telephony.Call;
+import com.android.phone.PhoneUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import android.net.Uri;
-import android.telecom.Conference;
-import android.telecom.ConferenceParticipant;
-import android.telecom.Conferenceable;
-import android.telecom.Connection;
-import android.telecom.DisconnectCause;
-import android.telecom.PhoneAccountHandle;
-import com.android.phone.PhoneUtils;
-
-import com.android.internal.telephony.Call;
-
 /**
  * Maintains a list of all the known TelephonyConnections connections and controls GSM and
  * default IMS conference call behavior. This functionality is characterized by the support of