diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 1b4d062..f06c332 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -63,7 +63,8 @@
                     style="@style/wifi_section"
                     android:visibility="gone">
 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_method"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
@@ -75,7 +76,8 @@
                             android:entries="@array/wifi_eap_method" />
                 </LinearLayout>
                 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_phase2"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
@@ -87,7 +89,8 @@
                             android:entries="@array/wifi_phase2_entries" />
                 </LinearLayout>
 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_ca_cert"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
@@ -98,7 +101,8 @@
                             android:prompt="@string/wifi_eap_ca_cert" />
                 </LinearLayout>
 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_user_cert"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
@@ -109,7 +113,8 @@
                             android:prompt="@string/wifi_eap_user_cert" />
                 </LinearLayout>
 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_identity"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
@@ -121,7 +126,8 @@
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
 
-                <LinearLayout
+                <LinearLayout android:id="@+id/l_anonymous"
+                        android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
                             style="@style/wifi_item_label"
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 54b97ab..473c6ba 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -141,12 +141,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Siempre"</item>
-    <item msgid="844721238536786870">"Sólo cuando está conectado"</item>
+    <item msgid="844721238536786870">"Sólo cuando está enchufado"</item>
     <item msgid="2990218920631468642">"Nunca (aumenta el uso de los datos)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Siempre"</item>
-    <item msgid="7433294150916905997">"Sólo cuando está conectado"</item>
+    <item msgid="7433294150916905997">"Sólo cuando está enchufado"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -186,7 +186,7 @@
     <item msgid="8673874894887358090">"Manual"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
-    <item msgid="5165439859689033665">"Desactivado"</item>
+    <item msgid="5165439859689033665">"Apagado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
     <item msgid="6038758039030476855">"Vibrar"</item>
   </string-array>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 34fa04b..fdc8ae2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1260,11 +1260,11 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediapalvelin"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Äänisyöte ja -tulo"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Äänisyöte- ja -tulo-asetukset"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"Puhehaku"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Äänihaku"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-näppäimistö"</string>
     <string name="voice_category" msgid="1430370497125803904">"Puhe"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Äänentunnistus"</string>
-    <string name="recognizer_settings_title" msgid="432493301215113154">"Puhehaku"</string>
+    <string name="recognizer_settings_title" msgid="432493301215113154">"Äänihaku"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>-asetukset"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Tekstistä puheeksi -asetukset"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Tekstistä puheeksi -toisto"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 8761c9a..9e33c75 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -30,8 +30,8 @@
     <item msgid="8392017019801393511">"Wszystkie"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 sek."</item>
-    <item msgid="8881760709354815449">"30 sek."</item>
+    <item msgid="3342301044271143016">"15 sekund"</item>
+    <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 min"</item>
     <item msgid="7001195990902244174">"2 min"</item>
     <item msgid="7489864775127957179">"5 min"</item>
@@ -50,9 +50,9 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Natychmiast"</item>
-    <item msgid="6736512735606834431">"5 sek."</item>
-    <item msgid="8044619388267891375">"15 sek."</item>
-    <item msgid="1822002388249545488">"30 sek."</item>
+    <item msgid="6736512735606834431">"5 sekund"</item>
+    <item msgid="8044619388267891375">"15 sekund"</item>
+    <item msgid="1822002388249545488">"30 sekund"</item>
     <item msgid="8538071621211916519">"1 min"</item>
     <item msgid="5663439580228932882">"2 min"</item>
     <item msgid="49888496216106852">"5 min"</item>
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"Mały"</item>
     <item msgid="1932071435506638315">"Normalny"</item>
     <item msgid="38373998008112077">"Duży"</item>
-    <item msgid="7786168277516233536">"Ogromny"</item>
+    <item msgid="7786168277516233536">"Ogromna"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Bardzo wolno"</item>
@@ -227,7 +227,7 @@
     <item msgid="9174900380056846820">"Zawsze sprawdzaj"</item>
   </string-array>
   <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Nigdy nie sprawdzaj HDCP"</item>
+    <item msgid="505558545611516707">"Nie sprawdzaj HDCP"</item>
     <item msgid="3878793616631049349">"Użyj sprawdzania HDCP tylko w przypadku treści chronionych DRM"</item>
     <item msgid="45075631231212732">"Zawsze używaj sprawdzania HDCP"</item>
   </string-array>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 5633e42..45f0cf8 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -233,19 +233,19 @@
   </string-array>
   <string-array name="window_animation_scale_entries">
     <item msgid="8134156599370824081">"Animação desligada"</item>
-    <item msgid="6624864048416710414">"Escala da animação 0,5 x"</item>
-    <item msgid="2219332261255416635">"Escala da animação 1x"</item>
+    <item msgid="6624864048416710414">"Animação escala 0,5 x"</item>
+    <item msgid="2219332261255416635">"Animação escala 1x"</item>
     <item msgid="3544428804137048509">"Escala de animação 1,5 x"</item>
-    <item msgid="3110710404225974514">"Escala da animação 2x"</item>
+    <item msgid="3110710404225974514">"Animação escala 2x"</item>
     <item msgid="4402738611528318731">"Escala de animação 5 x"</item>
     <item msgid="6189539267968330656">"Escala de animação 10 x"</item>
   </string-array>
   <string-array name="transition_animation_scale_entries">
     <item msgid="8464255836173039442">"Animação desligada"</item>
-    <item msgid="3375781541913316411">"Escala da animação 0,5 x"</item>
-    <item msgid="1991041427801869945">"Escala da animação 1x"</item>
+    <item msgid="3375781541913316411">"Animação escala 0,5 x"</item>
+    <item msgid="1991041427801869945">"Animação escala 1x"</item>
     <item msgid="4012689927622382874">"Escala de animação 1,5 x"</item>
-    <item msgid="3289156759925947169">"Escala da animação 2x"</item>
+    <item msgid="3289156759925947169">"Animação escala 2x"</item>
     <item msgid="7705857441213621835">"Escala de animação 5 x"</item>
     <item msgid="6660750935954853365">"Escala de animação 10 x"</item>
   </string-array>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 2e9a7ee..238bd05 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -29,8 +29,6 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Tuts"</item>
   </string-array>
-    <!-- no translation found for screen_timeout_entries:4 (7489864775127957179) -->
-    <!-- no translation found for screen_timeout_entries:5 (2314124409517439288) -->
     <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
     <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
     <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
@@ -125,18 +123,22 @@
     <item msgid="3565079809875324621">"Bun"</item>
     <item msgid="5702329417707689835">"Excellent"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries:0 (3269131034472904310) -->
-    <!-- no translation found for wifi_sleep_policy_entries:1 (844721238536786870) -->
-    <!-- no translation found for wifi_sleep_policy_entries:2 (2990218920631468642) -->
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="3269131034472904310">"Sch\'il visur sa stizza"</item>
+    <!-- outdated translation 1549288661423279207 -->     <item msgid="844721238536786870">"\"Mai, sche connectà\""</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="2990218920631468642">"Mai"</item>
+  </string-array>
     <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2124319326282651391) -->
     <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (7433294150916905997) -->
     <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (1390404486722375028) -->
     <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
     <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
     <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
-    <!-- no translation found for usage_stats_display_order_types:0 (2100172576767439288) -->
-    <!-- no translation found for usage_stats_display_order_types:1 (3703676222230317933) -->
-    <!-- no translation found for usage_stats_display_order_types:2 (2502754479975776899) -->
+  <string-array name="usage_stats_display_order_types">
+    <!-- outdated translation 9077371706468756228 -->     <item msgid="2100172576767439288">"Temp d\'utilisaziun"</item>
+    <!-- outdated translation 1908750532762193304 -->     <item msgid="3703676222230317933">"Dumber quantas giadas avià"</item>
+    <!-- outdated translation 1213951670006606353 -->     <item msgid="2502754479975776899">"Num da l\'applicaziun"</item>
+  </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 7d669bb..60f4c10 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -212,9 +212,9 @@
     <item msgid="4498124044785815005">"На усмотрение системы"</item>
   </string-array>
   <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Выкл."</item>
+    <item msgid="783505504936446770">"Выключить"</item>
     <item msgid="4804571292609523335">"Вибросигнал"</item>
-    <item msgid="595707141547423573">"Вкл."</item>
+    <item msgid="595707141547423573">"Без звука"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b206d8e..da81464 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -588,7 +588,7 @@
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Режим без звука"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Мелодия телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Звуковые эффекты"</string>
@@ -1015,10 +1015,10 @@
     <string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Переместить"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Переместить на планшет"</string>
-    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Перенести на телефон"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Переместить на телефон"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перенести на USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Переместить на SD-карту"</string>
-    <string name="moving" msgid="6431016143218876491">"Перенос..."</string>
+    <string name="moving" msgid="6431016143218876491">"Перемещение"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Недостаточно места."</string>
     <string name="does_not_exist" msgid="3476487214886606748">"Приложение не установлено."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Приложение защищено от копирования."</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 684cb86..4927685 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -212,8 +212,8 @@
     <item msgid="4498124044785815005">"Naj odloči sistem"</item>
   </string-array>
   <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Izklopi"</item>
-    <item msgid="4804571292609523335">"Vibriraj"</item>
+    <item msgid="783505504936446770">"Izklopljeno"</item>
+    <item msgid="4804571292609523335">"Vibriranje"</item>
     <item msgid="595707141547423573">"Izklopi zvok"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 3669232..624cfe8 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -33,10 +33,10 @@
     <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
     <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
-    <item msgid="7001195990902244174">"2 amaminithi"</item>
+    <item msgid="7001195990902244174">"amaminithi angu-2"</item>
     <item msgid="7489864775127957179">"amaminithii angu-5"</item>
-    <item msgid="2314124409517439288">"10 amaminithi"</item>
-    <item msgid="6864027152847611413">"30 amaminithi"</item>
+    <item msgid="2314124409517439288">"amaminithi angu-10"</item>
+    <item msgid="6864027152847611413">"amaminithi angu-30"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Akusoze"</item>
@@ -54,10 +54,10 @@
     <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
     <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
     <item msgid="8538071621211916519">"1 iminithi"</item>
-    <item msgid="5663439580228932882">"2 amaminithi"</item>
-    <item msgid="49888496216106852">"5 amaminithi"</item>
-    <item msgid="9002737361305019353">"10 amaminithi"</item>
-    <item msgid="4322676235684793329">"30 amaminithi"</item>
+    <item msgid="5663439580228932882">"amaminithi angu-2"</item>
+    <item msgid="49888496216106852">"amaminithi angu-5"</item>
+    <item msgid="9002737361305019353">"amaminithi angu-10"</item>
+    <item msgid="4322676235684793329">"amaminithi angu-30"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"Ncane"</item>
@@ -124,11 +124,11 @@
     <item msgid="1701505390737218306">"Ixhunyiwe kwi-inthanethi"</item>
     <item msgid="3189211552661432651">"Menyiwe"</item>
     <item msgid="3206450250360237549">"Akuphumelelanga"</item>
-    <item msgid="7785896708926971207">"Tholakalayo"</item>
+    <item msgid="7785896708926971207">"Yatholakala"</item>
     <item msgid="2330782789550628803">"Ikude nebanga"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 amaminithi"</item>
+    <item msgid="8151962652413645395">"amaminithi angu-2"</item>
     <item msgid="8675215713017289017">"amaminithii angu-5"</item>
     <item msgid="477015974247590543">"ihora elingu-1"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 97c6d99..80cb2cf 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -307,6 +307,8 @@
         <item>TLS</item>
         <!-- Do not translate. -->
         <item>TTLS</item>
+        <!-- Do not translate. -->
+        <item>PWD</item>
     </string-array>
 
    <!-- Wi-Fi WPS setup for p2p connections.  -->
@@ -416,6 +418,7 @@
         <item>PEAP</item>
         <item>TLS</item>
         <item>TTLS</item>
+        <item>PWD</item>
     </string-array>
 
     <!-- Phase 2 options -->
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 46d6c65..a2f0c3f 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1761,7 +1761,7 @@
             final long limitBytes = editor.getPolicyLimitBytes(template);
 
             bytesPicker.setMaxValue(Integer.MAX_VALUE);
-            if (warningBytes != WARNING_DISABLED) {
+            if (warningBytes != WARNING_DISABLED && limitBytes > 0) {
                 bytesPicker.setMinValue((int) (warningBytes / MB_IN_BYTES) + 1);
             } else {
                 bytesPicker.setMinValue(0);
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index ef438e6..fe2052c 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -123,8 +123,9 @@
                     updateLocationToggles();
                 }
             };
-            mContentQueryMap.addObserver(mSettingsObserver);
         }
+
+        mContentQueryMap.addObserver(mSettingsObserver);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2f8ae54..c64a225 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -97,6 +97,12 @@
     public static final int PROXY_NONE = 0;
     public static final int PROXY_STATIC = 1;
 
+    /* These values from from "wifi_eap_method" resource array */
+    public static final int WIFI_EAP_METHOD_PEAP = 0;
+    public static final int WIFI_EAP_METHOD_TLS  = 1;
+    public static final int WIFI_EAP_METHOD_TTLS = 2;
+    public static final int WIFI_EAP_METHOD_PWD  = 3;
+
     private static final String TAG = "WifiConfigController";
 
     private Spinner mNetworkSetupSpinner;
@@ -541,6 +547,7 @@
 
         if (mEapMethodSpinner == null) {
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
+            mEapMethodSpinner.setOnItemSelectedListener(this);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
             mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
             mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert);
@@ -562,6 +569,21 @@
                 mEapAnonymousView.setText(config.anonymous_identity.value());
             }
         }
+
+        mView.findViewById(R.id.l_method).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
+
+        if (mEapMethodSpinner.getSelectedItemPosition() == WIFI_EAP_METHOD_PWD){
+            mView.findViewById(R.id.l_phase2).setVisibility(View.GONE);
+            mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
+            mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE);
+            mView.findViewById(R.id.l_anonymous).setVisibility(View.GONE);
+        } else {
+            mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+        }
     }
     
     private void showNetworkSetupFields() {
@@ -761,6 +783,8 @@
         if (parent == mSecuritySpinner) {
             mAccessPointSecurity = position;
             showSecurityFields();
+        } else if (parent == mEapMethodSpinner) {
+            showSecurityFields();
         } else if (parent == mNetworkSetupSpinner) {
             showNetworkSetupFields();
         } else if (parent == mProxySettingsSpinner) {