diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 227b5e35bae..8c00d08c19a 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -62,7 +62,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
 
         // Create Locale picker part.
         final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker(
-                this, AppLocalePickerActivity.this, false /* translate only */);
+                this, AppLocalePickerActivity.this, false /* translate only */, mPackageName);
         // LocalePickerWithRegion use android.app.ListFragment. Thus, it can not user
         // getSupportFragmentManager() to add this into container.
         getFragmentManager()
@@ -101,7 +101,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
         if (localeInfo == null || localeInfo.getLocale() == null) {
             setAppDefaultLocale("");
         } else {
-            setAppDefaultLocale(localeInfo.getLocale().getLanguage());
+            setAppDefaultLocale(localeInfo.getLocale().toLanguageTag());
         }
         finish();
     }