diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3af57fe..6ba161e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -153,7 +153,7 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="ManagedProfileSetup">
+        <receiver android:name="SettingsInitialize">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
                 <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
@@ -2888,6 +2888,18 @@
                         android:value="true" />
         </activity>
 
+        <activity android:name=".WebViewImplementation"
+                  android:exported="true"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.settings.WEBVIEW_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <service
             android:name=".SettingsDumpService"
             android:exported="true"
diff --git a/res/layout/lockscreen_remote_input.xml b/res/layout/lockscreen_remote_input.xml
index af4bee0..1c565a3 100644
--- a/res/layout/lockscreen_remote_input.xml
+++ b/res/layout/lockscreen_remote_input.xml
@@ -15,14 +15,15 @@
   ~ limitations under the License
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
     <CheckBox
             android:id="@+id/lockscreen_remote_input"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_marginStart="20dp"
             android:paddingStart="20dp"
             android:paddingEnd="?android:attr/dialogPreferredPadding"
@@ -32,4 +33,13 @@
             android:gravity="center_vertical"
             android:text="@string/lockscreen_remote_input"
         />
-</FrameLayout>
\ No newline at end of file
+
+    <ImageView
+            android:id="@+id/restricted_lock_icon_remote_input"
+            android:layout_width="@dimen/restricted_icon_size"
+            android:layout_height="@dimen/restricted_icon_size"
+            android:src="@drawable/ic_info"
+            android:layout_marginEnd="?android:attr/dialogPreferredPadding"
+            android:layout_gravity="center_vertical"
+            android:scaleType="centerInside" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index f48b917..0c4273f 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -65,7 +65,7 @@
 
     </RadioGroup>
 
-    <CheckBox
+    <com.android.settings.RestrictedCheckBox
         android:id="@+id/lockscreen_remote_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/restricted_preference_dropdown.xml b/res/layout/restricted_preference_dropdown.xml
new file mode 100644
index 0000000..1a1e191
--- /dev/null
+++ b/res/layout/restricted_preference_dropdown.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <view android:id="@+id/spinner"
+            class="com.android.settings.notification.RestrictedDropDownPreference$ReselectionSpinner"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="invisible" />
+
+    <include layout="@layout/preference_material" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/setup_choose_lock_pattern_common.xml b/res/layout/setup_choose_lock_pattern_common.xml
index 857f244..0a38637 100644
--- a/res/layout/setup_choose_lock_pattern_common.xml
+++ b/res/layout/setup_choose_lock_pattern_common.xml
@@ -21,6 +21,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout="@layout/setup_choose_lock_pattern_template"
     settings:suwBackgroundTile="@drawable/setup_illustration_tile"
     settings:suwHeaderText="@string/wifi_setup_wizard_title"
     settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
@@ -43,11 +44,11 @@
 
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
-                android:layout_height="0dip"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:minLines="2"
                 android:gravity="center"
-                android:minHeight="50dip"
-                android:textSize="18sp"/>
+                android:textSize="18sp" />
 
             <Button android:id="@+id/retryButton"
                 style="@android:style/Widget.Material.Button.Borderless.Colored"
@@ -59,8 +60,7 @@
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
-                android:layout_weight="4"
-                android:background="@color/lock_pattern_background"/>
+                android:layout_weight="4" />
 
         </LinearLayout>
 
diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
index e0f2d94..40b4215 100644
--- a/res/layout/setup_redaction_interstitial.xml
+++ b/res/layout/setup_redaction_interstitial.xml
@@ -74,7 +74,7 @@
 
             <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
                  SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
-            <CheckBox
+            <com.android.settings.RestrictedRadioButton
                 android:id="@+id/lockscreen_remote_input"
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
diff --git a/res/layout/spinner_dropdown_restricted_item.xml b/res/layout/spinner_dropdown_restricted_item.xml
new file mode 100644
index 0000000..823b430
--- /dev/null
+++ b/res/layout/spinner_dropdown_restricted_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+    <TextView android:id="@android:id/text1"
+            style="?android:attr/spinnerDropDownItemStyle"
+            android:singleLine="true"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="?android:attr/listPreferredItemHeightSmall"
+            android:ellipsize="marquee" />
+    <ImageView android:id="@+id/restricted_icon"
+            android:layout_width="@dimen/restricted_icon_size"
+            android:layout_height="@dimen/restricted_icon_size"
+            android:src="@drawable/ic_info"
+            android:baselineAlignBottom="true"
+            android:layout_marginEnd="@dimen/restricted_icon_padding"
+            android:gravity="end|center_vertical"
+            android:visibility="gone" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 44523f4..ceb7201 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -15,9 +15,10 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:fadeScrollbars="false">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fadeScrollbars="false"
+        android:scrollIndicators="top|bottom">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -71,7 +72,7 @@
                 <Spinner android:id="@+id/security"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_spinner"
                         android:prompt="@string/wifi_security"
                         android:entries="@array/wifi_security" />
             </LinearLayout>
@@ -103,7 +104,7 @@
                     <Spinner android:id="@+id/method"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_spinner"
                             android:prompt="@string/wifi_eap_method"
                             android:entries="@array/wifi_eap_method" />
                 </LinearLayout>
@@ -122,7 +123,7 @@
                     <Spinner android:id="@+id/phase2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_spinner"
                             android:prompt="@string/please_select_phase2"
                             android:entries="@array/wifi_phase2_entries" />
                 </LinearLayout>
@@ -141,7 +142,7 @@
                     <Spinner android:id="@+id/ca_cert"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_spinner"
                             android:prompt="@string/wifi_eap_ca_cert" />
                 </LinearLayout>
 
@@ -201,7 +202,7 @@
                     <Spinner android:id="@+id/user_cert"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_spinner"
                             android:prompt="@string/wifi_eap_user_cert" />
                 </LinearLayout>
 
@@ -285,6 +286,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/wifi_item"
+                android:paddingBottom="4dp"
                 android:visibility="gone">
             <CheckBox android:id="@+id/wifi_advanced_togglebox"
                     android:layout_width="match_parent"
@@ -314,7 +316,7 @@
                 <Spinner android:id="@+id/proxy_settings"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_spinner"
                         android:prompt="@string/proxy_settings_title"
                         android:entries="@array/wifi_proxy_settings" />
 
@@ -439,7 +441,7 @@
                 <Spinner android:id="@+id/ip_settings"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_spinner"
                         android:prompt="@string/wifi_ip_settings"
                         android:entries="@array/wifi_ip_settings" />
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9e9d39c..cb55b05 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Vertrou of verwyder sertifikate</item>
       <item quantity="one">Vertrou of verwyder sertifikaat</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> het sertifikaatoutoriteite vir jou werkprofiel geïnstalleer, wat hulle in staat kan stel om werknetwerkaktiwiteit, insluitend e-posse, programme en beveiligde webwerwe, te monitor. Jy kan kies om hierdie sertifikate te vertrou of te verwyder.\n\nKontak jou administrateur vir meer inligting oor hierdie sertifikate.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> het \'n sertifikaatoutoriteit vir jou werkprofiel geïnstalleer, wat hulle in staat kan stel om werknetwerkaktiwiteit, insluitend e-posse, programme en beveiligde webwerwe, te monitor. Jy kan kies om hierdie sertifikaat te vertrou of te verwyder.\n\nKontak jou administrateur vir meer inligting oor hierdie sertifikaat.</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0cccb54..211a376 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">የእውቅና ማረጋገጫዎችን ይመኑ ወይም ያስወግዱ</item>
       <item quantity="other">የእውቅና ማረጋገጫዎችን ይመኑ ወይም ያስወግዱ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ለስራ መገለጫዎ የእውቅና ማረጋገጫ ባለስልጣናትን ጭነዋል፣ ይህም ኢሜይሎች፣ መተግበሪያዎች እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችም ጨምሮ የስራ አውታረ መረብ እንቅስቃሴን እንዲከታተሉ ሊያስችላቸው ይችላል። እነዚህን የእውቅና ማረጋገጫዎች ለማመን ወይም ለማስወገድ መምረጥ ይችላሉ።\n\nስለእነዚህ እውቅና ማረጋገጫዎች ተጨማሪ መረጃ ለማግኘት አስተዳዳሪዎን ያነጋግሩ።</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ለስራ መገለጫዎ የእውቅና ማረጋገጫ ባለስልጣናትን ጭነዋል፣ ይህም ኢሜይሎች፣ መተግበሪያዎች እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችም ጨምሮ የስራ አውታረ መረብ እንቅስቃሴን እንዲከታተሉ ሊያስችላቸው ይችላል። እነዚህን የእውቅና ማረጋገጫዎች ለማመን ወይም ለማስወገድ መምረጥ ይችላሉ።\n\nስለእነዚህ እውቅና ማረጋገጫዎች ተጨማሪ መረጃ ለማግኘት አስተዳዳሪዎን ያነጋግሩ።</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2d0df63..491577d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2337,6 +2337,7 @@
       <item quantity="other">الثقة أو إزالة الشهادات</item>
       <item quantity="one">الثقة أو إزالة الشهادة</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="zero">تم بواسطة <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> تثبيت شهادات مرجعية لملفك الشخصي للعمل، وهذا قد يسمح بمراقبة أنشطة شبكة العمل، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة. يمكنك اختيار الوثوق بهذه الشهادات أو إزالتها.\n\nللحصول على مزيد من المعلومات حول هذه الشهادات، يمكنك الاتصال بالمشرف.</item>
       <item quantity="two">تم بواسطة <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> تثبيت شهادتين مرجعيتين لملفك الشخصي للعمل، وهذا قد يسمح بمراقبة أنشطة شبكة العمل، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة. يمكنك اختيار الوثوق بهاتين الشهادتين أو إزالتهما.\n\nللحصول على مزيد من المعلومات حول هاتين الشهادتين، يمكنك الاتصال بالمشرف.</item>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index cf87d56..61763f1 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Sertifikata gevənin və ya silin</item>
       <item quantity="one">Sertifikata gevənin və ya silin</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> iş profiliniz üçün e-poçt, tətbiq və təhlükəsiz veb saytları daxil olmaqla iş şəbəkə fəaliyyətinizi izləməyə icazə verəcək sertifikat səlahiyyətlərini quraşdırdı. Bu sertifikatlara etibar edə və ya silə bilərsiniz.\n\nBu sertifikatlar haqqında ətraflı məlumat üçün adminlə əlaqə saxlayın.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> iş profiliniz üçün e-poçt, tətbiq və təhlükəsiz veb saytları daxil olmaqla iş şəbəkə fəaliyyətinizi izləməyə icazə verəcək sertifikat səlahiyyətini quraşdırdı. Bu sertifikata etibar edə və ya silə bilərsiniz.\n\nBu sertifikat haqqında ətraflı məlumat üçün adminlə əlaqə saxlayın.</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 4f18650..c1f767e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="few">Označite sertifikate kao pouzdane ili ih uklonite</item>
       <item quantity="other">Označite sertifikate kao pouzdane ili ih uklonite</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirao autoritete za izdavanje sertifikata za vaš profil za Work, što može da im omogućit da prate rad poslovne mreže, uključujući imejlove, aplikacije i bezbedne veb-sajtove. Možete da označite ove sertifikate kao pouzdane ili da ih uklonite.\n\nKontaktirajte administratora da biste saznali dodatne informacije o ovim sertifikatima.</item>
       <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirao autoritete za izdavanje sertifikata za vaš profil za Work, što može da im omogućit da prate rad poslovne mreže, uključujući imejlove, aplikacije i bezbedne veb-sajtove. Možete da označite ove sertifikate kao pouzdane ili da ih uklonite.\n\nKontaktirajte administratora da biste saznali dodatne informacije o ovim sertifikatima.</item>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index e78c4ef..6104a56 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="many">Давяраць сертыфікатам або выдаліць іх</item>
       <item quantity="other">Давяраць сертыфікатам або выдаліць іх</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтры сертыфікацыі для вашага для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты. Вы можаце давяраць гэтым сертыфікатам або выдаліць іх.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
       <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтры сертыфікацыі для вашага для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты. Вы можаце давяраць гэтым сертыфікатам або выдаліць іх.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8646dd2..58e58af 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Доверете се на тези сертификати или ги премахнете</item>
       <item quantity="one">Доверете се на този сертификат или го премахнете</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other">Домейнът <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> е инсталирал сертифициращи органи за служебния ви потребителски профил, което може да му разреши да наблюдава служебната ви активност в мрежата, включително имейли, приложения и защитени уебсайтове. Можете да изберете да се доверите на тези сертификати или да ги премахнете.\n\nЗа повече информация относно сертификатите се свържете с администратора си.</item>
       <item quantity="one">Домейнът <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> е инсталирал сертифициращ орган за служебния ви потребителски профил, което може да му разреши да наблюдава служебната ви активност в мрежата, включително имейли, приложения и защитени уебсайтове. Можете да изберете да се доверите на този сертификат или да го премахнете.\n\nЗа повече информация относно сертификата се свържете с администратора си.</item>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index e3a441a..8fa2665 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">টি শংসাপত্রের উপরে ভরসা করুন বা সেগুলিকে সরান</item>
       <item quantity="other">টি শংসাপত্রের উপরে ভরসা করুন বা সেগুলিকে সরান</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷ আপনি এই শংসাপত্রগুলির উপরে ভরসা করতে বা সেগুলিকে সরানোর জন্য যে কোনো একটিকে চয়ন করতে পারবেন৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷ আপনি এই শংসাপত্রগুলির উপরে ভরসা করতে বা সেগুলিকে সরানোর জন্য যে কোনো একটিকে চয়ন করতে পারবেন৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index bce5ae8..7843a31 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="few"> Vjerujte certifikatima ili ih uklonite</item>
       <item quantity="other"> Vjerujte certifikatima ili ih uklonite</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirala ustanove za izdavanje certifikata za vaš radni profil, koje joj mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije, i sigurne web stranice. Možete odlučiti da vjeujete ovim certifikatima ili da ih uklonite.\n\n Za više informacija o ovim certifikatima, obratite se administratoru.</item>
       <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirala ustanove za izdavanje certifikata za vaš radni profil, koje joj mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije, i sigurne web stranice. Možete odlučiti da vjeujete ovim certifikatima ili da ih uklonite.\n\n Za više informacija o ovim certifikatima, obratite se administratoru.</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fd8856d..b979dec 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Confia en els certificats o suprimeix-los</item>
       <item quantity="one">Confia en el certificat o suprimeix-lo</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha instal·lat autoritats de certificació al teu perfil professional, de manera que podrà supervisar la teva activitat professional a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web segurs. Pots triar si vols confiar en aquests certificats o suprimir-los.\n\nPer obtenir més informació sobre aquests certificats, contacta amb l\'administrador.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha instal·lat una autoritat de certificació per al teu perfil professional, de manera que podrà supervisar la teva activitat professional a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web segurs. Pots triar si vols confiar en aquest certificat o suprimir-lo.\n\nPer obtenir més informació sobre aquest certificat, contacta amb l\'administrador.</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ab18e4d..bc2d299 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="other">Označit certifikáty jako důvěryhodné nebo je odstranit</item>
       <item quantity="one">Označit certifikát jako důvěryhodný nebo jej odstranit</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="few">Doména <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> pro váš pracovní profil nainstalovala certifikační autority, které mohou umožnit monitorování aktivity v pracovní síti, včetně odesílání e-mailů, aplikací a zabezpečených webů. Můžete zvolit, zda těmto certifikátům chcete důvěřovat, nebo je chcete odebrat.\n\nDalší informace o těchto certifikátech vám sdělí váš administrátor.</item>
       <item quantity="many">Doména <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> pro váš pracovní profil nainstalovala certifikační autority, které mohou umožnit monitorování aktivity v pracovní síti, včetně odesílání e-mailů, aplikací a zabezpečených webů. Můžete zvolit, zda těmto certifikátům chcete důvěřovat, nebo je chcete odebrat.\n\nDalší informace o těchto certifikátech vám sdělí váš administrátor.</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a83d973..656675e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Tillad eller fjern certifikat</item>
       <item quantity="other">Tillad eller fjern certifikater</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> har installeret en certifikatmyndigheder for din arbejdsprofil, hvilket giver dem mulighed for at overvåge din netværksaktivitet, herunder e-mails, apps og sikre websites. Du kan vælge at tillade eller fjerne dette certifikat.\n\nKontakt din administrator for at få flere oplysninger om dette certifikat.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> har installeret en certifikatmyndigheder for din arbejdsprofil, hvilket giver dem mulighed for at overvåge din netværksaktivitet, herunder e-mails, apps og sikre websites. Du kan vælge at tillade eller fjerne disse certifikater.\n\nKontakt din administrator for at få flere oplysninger om disse certifikater.</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d3b6149..aa2a915 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Zertifikaten vertrauen oder sie entfernen</item>
       <item quantity="one">Zertifikat vertrauen oder entfernen</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> hat eine Zertifizierungsstellen für dein Arbeitsprofil installiert. Damit können deine geschäftlichen Netzwerkaktivitäten überwacht werden, einschließlich E-Mails, Apps und sicherer Websites. Du kannst diesen Zertifikaten entweder vertrauen oder sie entfernen.\n\nWeitere Informationen zu diesem Zertifikat erhältst du von deinem Administrator.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> hat eine Zertifizierungsstelle für dein Arbeitsprofil installiert. Damit können deine geschäftlichen Netzwerkaktivitäten überwacht werden, einschließlich E-Mails, Apps und sicherer Websites. Du kannst diesem Zertifikat entweder vertrauen oder es entfernen.\n\nWeitere Informationen zu diesem Zertifikat erhältst du von deinem Administrator.</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2b70342..896426f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Κατάργηση ή ορισμός των πιστοποιητικών ως αξιόπιστων</item>
       <item quantity="one">Κατάργηση ή ορισμός του πιστοποιητικού ως αξιόπιστου</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other">Ο τομέας <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> εγκατέστησε αρχές έκδοσης πιστοποιητικών για το προφίλ εργασίας σας, οι οποίες μπορούν να του επιτρέψουν να παρακολουθεί τη δραστηριότητα του δικτύου εργασίας σας, συμπεριλαμβανομένων των μηνυμάτων ηλεκτρονικού ταχυδρομείου, των εφαρμογών και των ασφαλών ιστότοπων. Μπορείτε να ορίσετε αυτά τα πιστοποιητικά ως αξιόπιστα ή να τα καταργήσετε.\n\nΓια περισσότερες πληροφορίες σχετικά με αυτά τα πιστοποιητικά, επικοινωνήστε με το διαχειριστή σας.</item>
       <item quantity="one">Ο τομέας <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> εγκατέστησε μια αρχή έκδοσης πιστοποιητικού για το προφίλ εργασίας σας, η οποία μπορεί να του επιτρέψει να παρακολουθεί τη δραστηριότητα του δικτύου εργασίας σας, συμπεριλαμβανομένων των μηνυμάτων ηλεκτρονικού ταχυδρομείου, των εφαρμογών και των ασφαλών ιστότοπων. Μπορείτε να ορίσετε αυτό το πιστοποιητικό ως αξιόπιστο ή να το καταργήσετε.\n\nΓια περισσότερες πληροφορίες σχετικά με αυτό το πιστοποιητικό, επικοινωνήστε με το διαχειριστή σας.</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 75f72b5..8120844 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Trust or remove certificates</item>
       <item quantity="one">Trust or remove certificate</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 75f72b5..8120844 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Trust or remove certificates</item>
       <item quantity="one">Trust or remove certificate</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 75f72b5..8120844 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Trust or remove certificates</item>
       <item quantity="one">Trust or remove certificate</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1be3b4f..264acd1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Confiar o quitar certificados</item>
       <item quantity="one">Confiar o quitar certificado</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instaló autoridades de certificación para tu perfil de trabajo que permiten controlar la actividad de red, incluidos los correos electrónicos, las apps y los sitios web seguros. Puedes confiar en estos certificados o quitarlos.\n\nComunícate con el administrador para obtener más información sobre los certificados.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instaló una autoridad de certificación para tu perfil de trabajo que permite controlar la actividad de red, incluidos los correos electrónicos, las apps y los sitios web seguros. Puedes confiar en este certificado o quitarlo.\n\nComunícate con el administrador para obtener más información sobre el certificado.</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5a74951..c60c6ba 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Confiar en los certificados o eliminarlos</item>
       <item quantity="one">Confiar en el certificado o eliminarlo</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha instalado entidades de certificación para tu perfil de trabajo que pueden permitir la monitorización de tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web seguros. Puedes confiar en estos certificados o eliminarlos.\n\nPonte en contacto con el administrador para obtener más información.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha instalado una entidad de certificación para tu perfil de trabajo que puede permitir la monitorización de tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web seguros. Puedes confiar en este certificado o eliminarlo.\n\nPonte en contacto con el administrador para obtener más información.</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 211c74b..dba4765 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Sertifikaatide usaldamine või eemaldamine</item>
       <item quantity="one">Sertifikaadi usaldamine või eemaldamine</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other">Domeen <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> installis teie tööprofiilile sertifikaadi volitused, mis võivad lubada sellel jälgida tegevusi töökoha võrgus (sh meilid, rakendused ja turvalised veebisaidid). Võite sertifikaate usaldada või need eemaldada.\n\nLisateabe saamiseks nende sertifikaatide kohta võtke ühendust administraatoriga.</item>
       <item quantity="one">Domeen <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> installis teie tööprofiilile sertifikaadi volituse, mis võib lubada sellel jälgida tegevusi töökoha võrgus (sh meilid, rakendused ja turvalised veebisaidid). Võite sertifikaati usaldada või selle eemaldada.\n\nLisateabe saamiseks selle sertifikaadi kohta võtke ühendust administraatoriga.</item>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index cceecc1..783dfb2 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Jo fidagarritzat edo kendu ziurtagiriak</item>
       <item quantity="one">Jo fidagarritzat edo kendu ziurtagiria</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> domeinuak ziurtagiri-emaile batzuk instalatu dizkizu laneko profilean. Hortaz, baliteke domeinuak laneko sarean egiten duzuna gainbegiratu ahal izatea, besteak beste, posta elektronikoan, aplikazioetan eta webgune seguruetan egiten duzuna. Ziurtagiriak fidagarritzat jo ditzakezu ala kendu egin ditzakezu.\n\nZiurtagiri horiei buruzko informazio gehiago lortzeko, jarri administratzailearekin harremanetan.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> domeinuak ziurtagiri-emaile bat instalatu dizu laneko profilean. Hortaz, baliteke domeinuak laneko sarean egiten duzuna gainbegiratu ahal izatea, besteak beste, posta elektronikoan, aplikazioetan eta webgune seguruetan egiten duzuna. Ziurtagiria fidagarritzat jo dezakezu ala kendu egin dezakezu.\n\nZiurtagiri horri buruzko informazio gehiago lortzeko, jarri administratzailearekin harremanetan.</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c24ef99..02c02a1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">اعتماد یا حذف گواهی</item>
       <item quantity="other">اعتماد یا حذف گواهی‌ها</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجع صدور گواهی‌ای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیت‌های کاری شبکه، از جمله رایانامه‌ها، برنامه‌ها و وب‌سایت‌های ایمن را کنترل کند. می‌توانید انتخاب کنید که به این گواهی اعتماد کنید یا آن را حذف کنید.\n\nبرای کسب اطلاعات بیشتر درباره این گواهی، با سرپرستتان تماس بگیرید.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مراجع صدور گواهی‌ای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیت‌های کاری شبکه، از جمله رایانامه‌ها، برنامه‌ها و وب‌سایت‌های ایمن را کنترل کند. می‌توانید انتخاب کنید که به این گواهی‌ها اعتماد کنید یا آنها را حذف کنید.\n\nبرای کسب اطلاعات بیشتر درباره این گواهی‌ها، با سرپرستتان تماس بگیرید.</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 67c1a90..1bf2e48 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Luota varmenteisiin tai poista niitä</item>
       <item quantity="one">Luota varmenteeseen tai poista se</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> on asentanut työprofiiliisi varmenteen myöntäjiä, mikä mahdollistaa toimintasi (kuten sähköpostin, sovellusten ja suojattujen verkkosivustojen käytön) seuraamisen työverkossa. Voit määrittää varmenteet luotettaviksi tai poistaa ne.\n\nSaat lisätietoja varmenteista järjestelmänvalvojaltasi.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> on asentanut työprofiiliisi varmenteen myöntäjän, mikä mahdollistaa toimintasi (kuten sähköpostin, sovellusten ja suojattujen verkkosivustojen käytön) seuraamisen työverkossa. Voit määrittää varmenteen luotettavaksi tai poistaa sen.\n\nSaat lisätietoja varmenteesta järjestelmänvalvojaltasi.</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ddf8f3e..c8f6b7b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Faire confiance au certificat ou le supprimer</item>
       <item quantity="other">Faire confiance aux certificats ou les supprimer</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés. Vous pouvez choisir de faire confiance à ce certificat ou bien de le supprimer.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>  a installé des autorités de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés. Vous pouvez choisir de faire confiance à ces certificats ou bien de les supprimer.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f988327..745c430 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Considérer le certificat comme fiable ou le supprimer</item>
       <item quantity="other">Considérer les certificats comme fiables ou les supprimer</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés. Vous pouvez choisir de vous fier à ce certificat ou le supprimer.\n\nPour en savoir plus sur ce certificat, contactez votre administrateur.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés. Vous pouvez choisir de vous fier à ces certificats ou les supprimer.\n\nPour en savoir plus sur ces certificats, contactez votre administrateur.</item>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index f2cffd3..6b3fd5e 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Confiar nos certificados ou eliminalos</item>
       <item quantity="one">Confiar no certificado ou eliminalo</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificación para o teu perfil de traballo que poden permitirlle supervisar a actividade da rede de traballo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros. Podes confiar nos certificados ou eliminalos.\n\nPara obter máis información sobre estes, ponte en contacto co administrador.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou unha autoridade de certificación para o teu perfil de traballo que pode permitirlle supervisar a actividade da rede dr traballo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros. Podes confiar no certificado ou eliminalo.\n\nPara obter máis información sobre este, ponte en contacto co administrador.</item>
@@ -3088,7 +3089,7 @@
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Busca de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permite buscas de contactos por parte da túa organización para identificar os emisores das chamadas e os contactos"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordenador"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auriculares"</string>
+    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auriculares con micrófono"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Teléfono"</string>
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Imaxes"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auriculares"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 9974886..eb9cff7 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -2267,6 +2267,7 @@
       <item quantity="one">પ્રમાણપત્રો પર વિશ્વાસ કરો અથવા તો દૂર કરો</item>
       <item quantity="other">પ્રમાણપત્રો પર વિશ્વાસ કરો અથવા તો દૂર કરો</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> એ તમારી કાર્ય પ્રોફાઇલ માટે પ્રમાણપત્ર સત્તાધિકારીઓ ઇન્સ્ટૉલ કર્યા, જે તેમને ઇમેઇલ્સ, ઍપ્લિકેશનો અને સુરક્ષિત વેબસાઇટ્સ સહિત કાર્ય નેટવર્ક પ્રવૃત્તિને મૉનિટર કરવાની મંજૂરી આપી શકે છે. તમે આ પ્રમાણપત્રો પર વિશ્વાસ કરવાનું અથવા તો દૂર કરવાનું પસંદ કરી શકો છો.\n\nઆ પ્રમાણપત્રો વિશે વધુ માહિતી માટે, તમારા વ્યવસ્થાપકનો સંપર્ક કરો.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> એ તમારી કાર્ય પ્રોફાઇલ માટે પ્રમાણપત્ર સત્તાધિકારીઓ ઇન્સ્ટૉલ કર્યા, જે તેમને ઇમેઇલ્સ, ઍપ્લિકેશનો અને સુરક્ષિત વેબસાઇટ્સ સહિત કાર્ય નેટવર્ક પ્રવૃત્તિને મૉનિટર કરવાની મંજૂરી આપી શકે છે. તમે આ પ્રમાણપત્રો પર વિશ્વાસ કરવાનું અથવા તો દૂર કરવાનું પસંદ કરી શકો છો.\n\nઆ પ્રમાણપત્રો વિશે વધુ માહિતી માટે, તમારા વ્યવસ્થાપકનો સંપર્ક કરો.</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fb8dd5b..8fa4d50 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
       <item quantity="other">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जो उन्हें ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइट सहित, कार्य नेटवर्क गतिविधि की निगरानी करने की अनुमति दे सकते हैं. आप इन प्रमाणपत्रों पर विश्वास करना या इन्हें निकालना चुन सकते हैं.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जो उन्हें ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइट सहित, कार्य नेटवर्क गतिविधि की निगरानी करने की अनुमति दे सकते हैं. आप इन प्रमाणपत्रों पर विश्वास करना या इन्हें निकालना चुन सकते हैं.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 42ef59d..077b5cb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="few">Označite certifikate kao pouzdane ili ih uklonite</item>
       <item quantity="other">Označite certifikate kao pouzdane ili ih uklonite</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalirala je izdavače certifikata za vaš radni profil, što joj može omogućiti nadzor nad aktivnostima radne mreže, uključujući e-poruke, aplikacije i zaštićene web-lokacije. Te certifikate možete označiti kao pouzdane ili ih ukloniti.\n\nViše informacija o certifikatima možete saznati od administratora.</item>
       <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalirala je izdavače certifikata za vaš radni profil, što joj može omogućiti nadzor nad aktivnostima radne mreže, uključujući e-poruke, aplikacije i zaštićene web-lokacije. Te certifikate možete označiti kao pouzdane ili ih ukloniti.\n\nViše informacija o certifikatima možete saznati od administratora.</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 93f0128..c57f359 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Tanúsítványok elfogadása megbízhatóként vagy eltávolítása</item>
       <item quantity="one">Tanúsítvány elfogadása megbízhatóként vagy eltávolítása</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> tanúsítványkibocsátókat telepített az Ön munkaprofiljához, ami lehetővé teheti a hálózati tevékenységek, beleértve az e-mailek, alkalmazások és biztonságos webhelyek figyelését. Ezeket a tanúsítványokat elfogadhatja megbízhatóként, vagy el is távolíthatja őket.\n\nHa további információt szeretne ezekről a tanúsítványokról, lépjen kapcsolatba a rendszergazdával.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> tanúsítványkibocsátót telepített az Ön munkaprofiljához, ami lehetővé teheti a hálózati tevékenységek, beleértve az e-mailek, alkalmazások és biztonságos webhelyek figyelését. Ezt a tanúsítványt elfogadhatja megbízhatóként, vagy el is távolíthatja.\n\nHa további információt szeretne erről a tanúsítványról, lépjen kapcsolatba a rendszergazdával.</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index b3852d2..b0988be 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Հաստատեք կամ հեռացրեք վկայականները</item>
       <item quantity="other">Հաստատեք կամ հեռացրեք վկայականները</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> տիրույթը ձեր աշխատանքային պրոֆիլի համար տեղադրել է սերտիֆիկացման կենտրոնի վկայականներ, որոնք կարող են նրան թույլ տալ վերահսկել աշխատանքային ցանցի գործունեությունը, ներառյալ էլփոստը, հավելվածները և ապահով կայքերը: Կարող եք վստահել այդ վկայականներին կամ հեռացնել դրանք:\n\nԱյս վկայականների մասին լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր ադմինիստրատորին:</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> տիրույթը ձեր աշխատանքային պրոֆիլի համար տեղադրել է սերտիֆիկացման կենտրոնի վկայականներ, որոնք կարող են նրան թույլ տալ վերահսկել աշխատանքային ցանցի գործունեությունը, ներառյալ էլփոստը, հավելվածները և ապահով կայքերը: Կարող եք վստահել այդ վկայականներին կամ հեռացնել դրանք:\n\nԱյս վկայականների մասին լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր ադմինիստրատորին:</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 87231cc..a925f37 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Percayai atau hapus sertifikat</item>
       <item quantity="one">Percayai atau hapus sertifikat</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> telah memasang otoritas sertifikat untuk profil kerja Anda, yang mungkin mengizinkan mereka memantau aktivitas jaringan kerja, termasuk email, aplikasi, dan situs web aman. Anda dapat memilih untuk memercayai atau menghapus sertifikat ini.\n\nUntuk informasi selengkapnya tentang sertifikat ini, hubungi admin.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang otoritas sertifikat untuk profil kerja Anda, yang mungkin mengizinkan mereka memantau aktivitas jaringan kerja, termasuk email, aplikasi, dan situs web aman. Anda dapat memilih untuk memercayai atau menghapus sertifikat ini.\n\nUntuk informasi selengkapnya tentang sertifikat ini, hubungi admin.</item>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index eca571c..ffb7358 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Treysta eða fjarlægja vottorð</item>
       <item quantity="other">Treysta eða fjarlægja vottorð</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> hefur sett upp CA-vottorð fyrir vinnusniðið þitt, sem getur gert þeim kleift að fylgjast með netnotkuninni á vinnusniðinu, þar á meðal tölvupósti, forritum og öruggum vefsvæðum. Þú getur valið að annaðhvort treysta þessum vottorðum eða fjarlægja þau.\n\nTil að fá frekari upplýsingar um þessi vottorð skaltu hafa samband við kerfisstjórann.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> hefur sett upp CA-vottorð fyrir vinnusniðið þitt, sem getur gert þeim kleift að fylgjast með netnotkuninni á vinnusniðinu, þar á meðal tölvupósti, forritum og öruggum vefsvæðum. Þú getur valið að annaðhvort treysta þessum vottorðum eða fjarlægja þau.\n\nTil að fá frekari upplýsingar um þessi vottorð skaltu hafa samband við kerfisstjórann.</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 37fb3e0..544c61a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Considera attendibili i certificati o rimuovili</item>
       <item quantity="one">Considera attendibile il certificato o rimuovilo</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha installato autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app. Puoi scegliere se considerare attendibili i certificati o rimuoverli.\n\nContatta l\'amministratore per avere ulteriori informazioni sui certificati.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app. Puoi scegliere se considerare attendibile il certificato o rimuoverlo.\n\nContatta l\'amministratore per avere ulteriori informazioni sul certificato.</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 74cca44..6bdc9d1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2303,6 +2303,7 @@
       <item quantity="other">קבלת מהימנות או הסרה של אישורים</item>
       <item quantity="one">קבלת מהימנות או הסרה של אישור</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="two"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> התקין רשויות אישורים לפרופיל העבודה שלך. ייתכן שהדבר יאפשר לו לנהל מעקב אחר פעילות רשת בעבודה, כולל אימיילים, אפליקציות ואתרים מאובטחים. תוכל לקבל את מהימנות האישורים או להסיר את האישורים.\n\nלקבלת מידע נוסף על אישורים אלה, פנה למנהל המערכת.</item>
       <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> התקין רשויות אישורים לפרופיל העבודה שלך. ייתכן שהדבר יאפשר לו לנהל מעקב אחר פעילות רשת בעבודה, כולל אימיילים, אפליקציות ואתרים מאובטחים. תוכל לקבל את מהימנות האישורים או להסיר את האישורים.\n\nלקבלת מידע נוסף על אישורים אלה, פנה למנהל המערכת.</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 45f44fe..1c004b2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2269,6 +2269,7 @@
       <item quantity="other">証明書の信頼または削除</item>
       <item quantity="one">証明書の信頼または削除</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> が、あなたの仕事用プロファイルに認証局をインストールしました。これにより、仕事のネットワーク アクティビティ（メール、アプリ、保護されたウェブサイトなど）が監視される場合があります。これらの証明書を信頼するか削除するかを選択できます。\n\nこれらの証明書の詳細についてはドメインの管理者までお問い合わせください。</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> が、あなたの仕事用プロファイルに認証局をインストールしました。これにより、仕事のネットワーク アクティビティ（メール、アプリ、保護されたウェブサイトなど）が監視される場合があります。この証明書を信頼するか削除するかを選択できます。\n\nこの証明書の詳細についてはドメインの管理者までお問い合わせください。</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a2d3dc8..ccd09a2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">სერტიფიკატების ნდობით აღჭურვა ან ამოშლა</item>
       <item quantity="one">სერტიფიკატის ნდობით აღჭურვა ან ამოშლა</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other">დომენმა <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> თქვენი სამსახურის პროფილისთვის სერტიფიცირების ორგანოების ინსტალაცია მოახდინა, რომელთა მეშვეობითაც ის თქვენი სამსახურის ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და დაცული ვებსაიტების) მონიტორინგს შეძლებს. შეგიძლიათ აირჩიოთ, რა გსურთ — ამ სერტიფიკატების ნდობით აღჭურვა, თუ მათი ამოშლა.\n\nამ სერტიფიკატების შესახებ დამატებითი ინფორმაციის მისაღებად, დაუკავშირდით თქვენს ადმინისტრატორს.</item>
       <item quantity="one">დომენმა <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> თქვენი სამსახურის პროფილისთვის სერტიფიცირების ორგანოს ინსტალაცია მოახდინა, რომლის მეშვეობითაც ის თქვენი სამსახურის ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და დაცული ვებსაიტების) მონიტორინგს შეძლებს. შეგიძლიათ აირჩიოთ, რა გსურთ — ამ სერტიფიკატის ნდობით აღჭურვა, თუ მისი ამოშლა.\n\nამ სერტიფიკატის შესახებ დამატებითი ინფორმაციის მისაღებად, დაუკავშირდით თქვენს ადმინისტრატორს.</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index a755631..22fc0af 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other"> Сертификаттарды қабылдау немесе жою</item>
       <item quantity="one"> Сертификатты қабылдау немесе жою</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> жұмыс профиліңізге сертификат орнатты. Бұл желідегі әрекеттеріңізді, оның ішінде электрондық хаттарды, қолданбаларды және қауіпсіз веб-сайттарды бақылауға мүмкіндік береді. Бұл сертификаттарды қабылдауға немесе жоюға болады.\n\nӘкімшіңізге хабарласып осы сертификаттар туралы қосымша ақпарат алыңыз.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> жұмыс профиліңізге сертификат орнатты. Бұл желідегі әрекеттеріңізді, оның ішінде электрондық хаттарды, қолданбаларды және қауіпсіз веб-сайттарды бақылауға мүмкіндік береді. Бұл сертификатты қабылдауға немесе жоюға болады.\n\n Әкімшіңізге хабарласып, осы сертификат туралы қосымша ақпарат алыңыз.</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e6d581c..5921a6a 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">ជឿទុកចិត្ត ឬយកវិញ្ញាបនបត្រចេញ</item>
       <item quantity="one">ជឿទុកចិត្ត ឬយកវិញ្ញាបនបត្រចេញ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> បានដំឡើងអាជ្ញាធរវិញ្ញាបនបត្រសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក ដែលអនុញ្ញាតឲ្យពួកវាត្រួតពិនិត្យសកម្មភាពបណ្តាញការងារ ដោយរាប់បញ្ចូលទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រដែលមានសុវត្ថិភាព។ អ្នកអាចជ្រើសថាជឿទុកចិត្ត ឬយកវិញ្ញាបនបត្រទាំងនេះចេញ។\n\nសម្រាប់ព័ត៌មានបន្ថែមអំពីវិញ្ញាបនបត្រនេះ សូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> បានដំឡើងអាជ្ញាធរវិញ្ញាបនបត្រសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក ដែលអនុញ្ញាតឲ្យពួកវាត្រួតពិនិត្យសកម្មភាពបណ្តាញការងារ ដោយរាប់បញ្ចូលទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រដែលមានសុវត្ថិភាព។ អ្នកអាចជ្រើសថាជឿទុកចិត្ត ឬយកវិញ្ញាបនបត្រនេះចេញ។\n\nសម្រាប់ព័ត៌មានបន្ថែមអំពីវិញ្ញាបនបត្រនេះ សូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។</item>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index e74ef3d..9c01116 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">ನಂಬಿ ಅಥವಾ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕಿ</item>
       <item quantity="other">ನಂಬಿ ಅಥವಾ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕಿ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ಪ್ರಮಾಣಪತ್ರ ಅಂಗೀಕಾರಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ, ಯಾವುದೇ ಇಮೇಲ್‌ಗಳು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಮತ್ತು ಸುರಕ್ಷಿತ ವೆಬ್‌ಸೈಟ್‌ಗಳು ಸೇರಿದಂತೆ ನೆಟ್‌ವರ್ಕ್ ಚಟುವಟಿಕೆಯ ಕೆಲಸದ ಪರಿವೀಕ್ಷಣೆಗೆ ಅವುಗಳನ್ನು ಅನುಮತಿಸಬಹುದು. ನೀವು ಈ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ನಂಬಿದಂತೆ ಅಥವಾ ತೆಗೆದುಹಾಕುವಂತೆ ಆಯ್ಕೆ ಮಾಡಬಹುದು. \n\nಈ ಪ್ರಮಾಣಪತ್ರಗಳ ಕುರಿತು ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.</item>
       <item quantity="other">ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ಪ್ರಮಾಣಪತ್ರ ಅಂಗೀಕಾರಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ, ಯಾವುದೇ ಇಮೇಲ್‌ಗಳು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಮತ್ತು ಸುರಕ್ಷಿತ ವೆಬ್‌ಸೈಟ್‌ಗಳು ಸೇರಿದಂತೆ ನೆಟ್‌ವರ್ಕ್ ಚಟುವಟಿಕೆಯ ಕೆಲಸದ ಪರಿವೀಕ್ಷಣೆಗೆ ಅವುಗಳನ್ನು ಅನುಮತಿಸಬಹುದು. ನೀವು ಈ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ನಂಬಿದಂತೆ ಅಥವಾ ತೆಗೆದುಹಾಕುವಂತೆ ಆಯ್ಕೆ ಮಾಡಬಹುದು. \n\nಈ ಪ್ರಮಾಣಪತ್ರಗಳ ಕುರಿತು ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1e0731c..1e00975 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">인증서 신뢰 또는 삭제</item>
       <item quantity="one">인증서 신뢰 또는 삭제</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>에서 직장 프로필의 인증기관을 설치했으며 해당 기관에서 이메일, 앱, 보안 웹사이트를 포함한 직장 네트워크 활동을 모니터링하도록 허용됩니다. 이 인증서를 신뢰할지 또는 삭제할지 선택할 수 있습니다.\n\n이 인증서를 자세히 알아보려면 관리자에게 문의하세요.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g>에서 직장 프로필의 인증기관을 설치했으며 해당 기관에서 이메일, 앱, 보안 웹사이트를 포함한 직장 네트워크 활동을 모니터링하도록 허용됩니다. 이 인증서를 신뢰할지 또는 삭제할지 선택할 수 있습니다.\n\n이 인증서를 자세히 알아보려면 관리자에게 문의하세요.</item>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 8a71d42..4108c3f 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -2264,6 +2264,7 @@
       <item quantity="other">Тастыктамаларды кабыл алыңыз же өчүрүп салыңыз</item>
       <item quantity="one">Тастыктаманы кабыл алыңыз же өчүрүп салыңыз</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> доменинин администратору жумуш профилиңизге ТБнун тастыктамаларын орнотту. Ушуну менен ал жумуш тармагындагы аракеттериңизге, электрондук почтанын жана колдонмолордун пайдаланылышына, ошондой эле кандай веб-сайттарга кирип жатканыңызды көзөмөлдөп турат. Тастыктамаларды кабыл алсаңыз же өчүрүп салсаңыз болот.\n\nБул тастыктамалар тууралуу көбүрөөк маалымат үчүн администраторуңузга кайрылыңыз.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> доменинин администратору жумуш профилиңизге ТБнун тастыктамасын орнотту. Ушуну менен ал жумуш тармагындагы аракеттериңизге, электрондук почтанын жана колдонмолордун пайдаланылышына, ошондой эле кандай веб-сайттарга кирип жатканыңызды көзөмөлдөп турат. Тастыктаманы кабыл алсаңыз же өчүрүп салсаңыз болот.\n\nБул тастыктама тууралуу көбүрөөк маалымат үчүн администраторуңузга кайрылыңыз.</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b73e228..ade8069 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">ເຊື່ອຖື ຫຼື ລຶບໃບຮັບຮອງອອກ</item>
       <item quantity="one">ເຊື່ອຖື ຫຼື ລຶບໃບຮັບຮອງອອກ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ໄດ້ຕິດຕັ້ງຜູ້ມີອຳນາດໃບຮັບຮອງໃຫ້ກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານແລ້ວ ເຊິ່ງອາດອະນຸຍາດໃຫ້ພວກເຂົາຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍໄດ້ ຮວມເຖິງອີເມວ, ແອັບ ແລະ ເວັບໄຊທີ່ເຂົ້າລະຫັດ. ທ່ານສາມາດເລືອກໄດ້ວ່າຈະເຊື່ອຖື ຫຼື ລຶບໃບຮັບຮອງເຫຼົ່ານີ້.\n\nສຳລັບຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບໃບຮັບຮອງເຫຼົ່ານີ້, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ໄດ້ຕິດຕັ້ງຜູ້ມີອຳນາດໃບຮັບຮອງໃຫ້ກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານແລ້ວ ເຊິ່ງອາດອະນຸຍາດໃຫ້ພວກເຂົາຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍໄດ້ ຮວມເຖິງອີເມວ, ແອັບ ແລະ ເວັບໄຊທີ່ເຂົ້າລະຫັດ. ທ່ານສາມາດເລືອກໄດ້ວ່າຈະເຊື່ອຖື ຫຼື ລຶບໃບຮັບຮອງນີ້.\n\nສຳລັບຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບໃບຮັບຮອງນີ້, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ.</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cf8a1e6..8bb41dd 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="many">Pasitikėti sertifikatais arba juos pašalinti</item>
       <item quantity="other">Pasitikėti sertifikatais arba juos pašalinti</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> įdiegė jūsų darbo profiliui skirtus sertifikato įgaliojimus, kurie gali leisti domenui stebėti jūsų darbo tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines. Galite pasirinkti pasitikėti šiais sertifikatais arba juos pašalinti.\n\nJei reikia daugiau informacijos apie šiuos sertifikatus, susisiekite su savo administratoriumi.</item>
       <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> įdiegė jūsų darbo profiliui skirtus sertifikato įgaliojimus, kurie gali leisti domenui stebėti jūsų darbo tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines. Galite pasirinkti pasitikėti šiais sertifikatais arba juos pašalinti.\n\nJei reikia daugiau informacijos apie šiuos sertifikatus, susisiekite su savo administratoriumi.</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1d7017d..2a9a1cd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="one">Sertifikātu pieņemšana vai noņemšana</item>
       <item quantity="other">Sertifikātu pieņemšana vai noņemšana</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="zero"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalēja sertificēšanas iestāžu sertifikātus jūsu darba profilam. Šie sertifikāti atļauj iestādēm pārraudzīt darbības darba tīklā, tostarp e-pasta kontus, lietotnes un drošās vietnes. Jūs varat pieņemt vai noņemt šos sertifikātus.\n\nLai iegūtu plašāku informāciju par šiem sertifikātiem, sazinieties ar savu administratoru.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalēja sertificēšanas iestāžu sertifikātus jūsu darba profilam. Šie sertifikāti atļauj iestādēm pārraudzīt darbības darba tīklā, tostarp e-pasta kontus, lietotnes un drošās vietnes. Jūs varat pieņemt vai noņemt šos sertifikātus.\n\nLai iegūtu plašāku informāciju par šiem sertifikātiem, sazinieties ar savu administratoru.</item>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index c4e6316..6753634 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Или имајте доверба или отстранете ги сертификатите</item>
       <item quantity="other">Или имајте доверба или отстранете ги сертификатите</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> инсталираше авторитети за сертификати за вашиот работен профил, што можат да им дозволат да ја следат активноста на работната мрежа, вклучувајќи ги е-пораките, апликациите и безбедните веб-сајтови. Може да изберете или да имате доверба или да ги отстраните сертификатите.\n\nЗа повеќе информации за сертификатите, контактирајте со администраторот.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> инсталираше авторитети за сертификати за вашиот работен профил, што можат да им дозволат да ја следат активноста на работната мрежа, вклучувајќи ги е-пораките, апликациите и безбедните веб-сајтови. Може да изберете или да имате доверба или да ги отстраните сертификатите.\n\nЗа повеќе информации за сертификатите, контактирајте со администраторот.</item>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 3a190b3..15b2ff2 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">സർട്ടിഫിക്കറ്റുകൾ പരിചിതമാക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക</item>
       <item quantity="one">സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> സർട്ടിഫിക്കറ്റ് അതോറിറ്റികൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റുകളെ പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റുകളെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
       <item quantity="one">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 36fec34..0b165fc 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -2255,6 +2255,7 @@
       <item quantity="other">Сертификатад итгэх, эсвэл устгах</item>
       <item quantity="one">Сертификатад итгэх, эсвэл устгах</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> сертификатын эрхийг таны ажлын профайлд суулгасан бөгөөд үүнд имэйл, апп, аюулгүй вэб сайт зэрэг ажлын сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно. Та эдгээр сертификад итгэх, эсвэл устгах боломжтой.\n\nЭдгээр сертификатын талаар дэлгэрэнгүй мэдээлэл авахыг хүсвэл админтайгаа холбогдоно уу.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> таны ажлын профайлд сертификатын эрхийг суулгасан бөгөөд үүнийг имэйл, апп, аюулгүй вэб сайт зэрэг ажлын сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно. Та энэ сертификатад итгэх, эсвэл устгах боломжтой.\n\nЭнэ сертификатын талаар дэлгэрэнгүй мэдээлэл авахыг хүсвэл админтайгаа холбогдоно уу.</item>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index c57d93f..d967931 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">विश्वासू किंवा काढा प्रमाणपत्र</item>
       <item quantity="other">विश्वासू किंवा काढा प्रमाणपत्रे</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी एक प्रमाणप‍त्र अधिकार स्थापित केला आहे, जो त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देतो. आपण विश्वास ठेवणे किंवा हे प्रमाणपत्र काढणे निवडू शकता.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी प्रमाणप‍त्र अधिकार स्थापित केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देतात. आपण विश्वास ठेवणे किंवा ही प्रमाणपत्रे काढणे निवडू शकता.\n\nया प्रमाणपत्रांविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8acb002..7cc2250 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Percayai atau alih keluar sijil</item>
       <item quantity="one">Percayai atau alih keluar sijil</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>  telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan tapak web selamat. Anda boleh memilih untuk mempercayai atau mengalih keluar sijil ini.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan tapak web selamat. Anda boleh memilih untuk mempercayai atau mengalih keluar sijil ini.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 9871a6e..9d26cb2 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">ယုံကြည်ပါ သို့မဟုတ် အသိအမှတ်ပြုလက်မှတ်များကို ဖယ်ရှားပါ</item>
       <item quantity="one">ယုံကြည်ပါ သို့မဟုတ် အသိအမှတ်ပြုလက်မှတ်ကို ဖယ်ရှားပါ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> သည် သင့်အလုပ်ပရိုဖိုင်အတွက် အသိအမှတ်ပြုခွင့်များကိုထည့်သွင်းလိုက်ပါသည်။ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များအပါအဝင် အလုပ်ကွန်ရက်လှုပ်ရှားမှုကို စောင့်ကြည့်ခြင်းနှင့် ဝဘ်ဆိုက်များကို လုံခြုံစေခြင်းတို့ ပြုလုပ်နိုင်ပါသည်။ ဤအသိအမှတ်ပြုလက်မှတ်များကို ယုံကြည်ရန် သို့မဟုတ် ဖယ်ရှားရန် သင့်စိတ်ကြိုက်ရွေးချယ်နိုင်သည်။\n\nဤအသိအမှတ်ပြုလက်မှတ်များအကြောင်း ထပ်မံသိရှိရန် သင့်စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> သည် သင့်အလုပ်ပရိုဖိုင်အတွက် အသိအမှတ်ပြုခွင့်ကို ထည့်သွင်းလိုက်ပါသည်။ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များအပါအဝင် အလုပ်ကွန်ရက်လှုပ်ရှားမှုကို စောင့်ကြည့်ခြင်းနှင့် ဝဘ်ဆိုက်များကို လုံခြုံစေခြင်းတို့ ပြုလုပ်နိုင်ပါသည်။ ဤအသိအမှတ်ပြုလက်မှတ်ကို ယုံကြည်ရန် သို့မဟုတ် ဖယ်ရှားရန် သင့်စိတ်ကြိုက်ရွေးချယ်နိုင်သည်။\n\nဤအသိအမှတ်ပြုလက်မှတ်အကြောင်း ထပ်မံသိရှိရန် သင့်စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4a036c5..700a85c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Stol på eller fjern sertifikatene</item>
       <item quantity="one">Stol på eller fjern sertifikatet</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> har installert sertifiseringsinstanser for jobbprofilen din. Dette kan gi instansene tillatelse til å overvåke nettaktiviteten på jobben, inkludert e-poster, apper og sikre nettsteder. Du kan velge om du vil stole på eller fjerne disse sertifikatene.\n\nFor mer informasjon om disse sertifikatene, ta kontakt med administratoren din.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> har installert en sertifiseringsinstans for jobbprofilen din. Dette kan gi instansen tillatelse til å overvåke nettaktiviteten på jobben, inkludert e-poster, apper og sikre nettsteder. Du kan velge om du vil stole på eller fjerne dette sertifikatet.\n\nFor mer informasjon om dette sertifikatet, ta kontakt med administratoren din.</item>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 75152ad..1220576 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">प्रमाणपत्रहरूलाई विश्वास गर्नुहोस् वा हटाउनुहोस्</item>
       <item quantity="one">प्रमाणपत्रलाई विश्वास गर्नुहोस् वा हटाउनुहोस्</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ले तपाईँको कार्य प्रोफाइलका लागि प्रमाणपत्र अख्तियारीहरूलाई स्थापना गरेको छ जसले त्यसलाई इमेल, अनुप्रयोग र सुरक्षित वेबसाइटहरू लगायत कार्य प्रोफाइलको नेटवर्क सम्बन्धी गतिविधिलाई अनुगमन गर्नका लागि अनुमति दिन सक्छ। तपाईँ यी प्रमाणपत्रहरूलाई विश्वास गर्ने कि हटाउने भनी छनोट गर्न सक्नुहुन्छ।\n\nयी प्रमाणपत्रहरू बारे थप जानकारीका लागि आफ्नो प्रशासकलाई सम्पर्क गर्नुहोस्।</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ले तपाईँको कार्य प्रोफाइलका लागि प्रमाणपत्र अख्तियारीलाई स्थापना गरेको छ जसले त्यसलाई इमेल, अनुप्रयोग र सुरक्षित वेबसाइटहरू लगायत कार्य प्रोफाइलको नेटवर्क सम्बन्धी गतिविधिलाई अनुगमन गर्नका लागि अनुमति दिन सक्छ। तपाईँ यस प्रमाणपत्रलाई विश्वास गर्ने कि हटाउने भनी छनोट गर्न सक्नुहुन्छ।\n\nयस प्रमाणपत्र बारे थप जानकारीका लागि आफ्नो प्रशासकलाई सम्पर्क गर्नुहोस्।</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4037e19..354950f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Certificaten vertrouwen of verwijderen</item>
       <item quantity="one">Certificaat vertrouwen of verwijderen</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> heeft certificeringsinstanties voor je werkprofiel geïnstalleerd, waardoor dit domein activiteit in het werknetwerk kan bijhouden, waaronder e-mails, apps en beveiligde websites. Je kunt ervoor kiezen deze certificaten te vertrouwen of te verwijderen.\n\nNeem contact op met je beheerder voor meer informatie over deze certificaten.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> heeft een certificeringsinstantie voor je werkprofiel geïnstalleerd, waardoor dit domein activiteit in het werknetwerk kan bijhouden, waaronder e-mails, apps en beveiligde websites. Je kunt ervoor kiezen dit certificaat te vertrouwen of te verwijderen.\n\nNeem contact op met je beheerder voor meer informatie over dit certificaat.</item>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index fc1bb97..ba31a88 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰੋ ਜਾਂ ਹਟਾਓ</item>
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰੋ ਜਾਂ ਹਟਾਓ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦਿੰਦੀਆਂ ਹੈ, ਜਿਸ ਵਿੱਚ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸ਼ਾਮਲ ਹਨ। ਤੁਸੀਂ ਇਹ ਚੁਣ ਸਕਦੇ ਹੋ ਕਿ ਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰਨਾ ਹੈ ਜਾਂ ਇਹਨਾਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦਿੰਦੀਆਂ ਹੈ, ਜਿਸ ਵਿੱਚ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸ਼ਾਮਲ ਹਨ। ਤੁਸੀਂ ਇਹ ਚੁਣ ਸਕਦੇ ਹੋ ਕਿ ਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰਨਾ ਹੈ ਜਾਂ ਇਹਨਾਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cf34070..de8100b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="other">Zaufaj certyfikatom lub je usuń</item>
       <item quantity="one">Zaufaj certyfikatowi lub go usuń</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała urzędy certyfikacji dla Twojego profilu do pracy, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych. Możesz zaufać tym certyfikatom lub je usunąć.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się ze swoim administratorem.</item>
       <item quantity="many">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała urzędy certyfikacji dla Twojego profilu do pracy, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych. Możesz zaufać tym certyfikatom lub je usunąć.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się ze swoim administratorem.</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a3e72f2..832fd74 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Confiar ou remover certificados</item>
       <item quantity="other">Confiar ou remover certificados</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificado para seu perfil de trabalho, o que pode permitir que ele monitore sua atividade profissional na rede, incluindo e-mails, apps e websites seguros. É possível optar por confiar nesses certificados ou removê-los.\n\nPara ver mais informações sobre esses certificados, entre em contato com seu admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificado para seu perfil de trabalho, o que pode permitir que ele monitore sua atividade profissional na rede, incluindo e-mails, apps e websites seguros. É possível optar por confiar nesses certificados ou removê-los.\n\nPara ver mais informações sobre esses certificados, entre em contato com seu admin.</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f04aef6..20096bd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Confiar ou remover os certificados</item>
       <item quantity="one">Confiar ou remover o certificado</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros. Pode optar por confiar nestes certificados ou removê-los.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros. Pode optar por confiar neste certificado ou removê-lo.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a3e72f2..832fd74 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Confiar ou remover certificados</item>
       <item quantity="other">Confiar ou remover certificados</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificado para seu perfil de trabalho, o que pode permitir que ele monitore sua atividade profissional na rede, incluindo e-mails, apps e websites seguros. É possível optar por confiar nesses certificados ou removê-los.\n\nPara ver mais informações sobre esses certificados, entre em contato com seu admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificado para seu perfil de trabalho, o que pode permitir que ele monitore sua atividade profissional na rede, incluindo e-mails, apps e websites seguros. É possível optar por confiar nesses certificados ou removê-los.\n\nPara ver mais informações sobre esses certificados, entre em contato com seu admin.</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 71a3cfc..1473473 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="other">Setați ca fiind de încredere sau eliminați certificatele</item>
       <item quantity="one">Setați ca fiind de încredere sau eliminați certificatul</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a instalat o autoritate de certificare pentru profilul dvs. de serviciu, ceea ce îi poate permite să monitorizeze activitatea în rețeaua de serviciu, inclusiv e-mailurile, aplicațiile și site-urile securizate. Puteți alege să setați certificatele ca fiind de încredere sau să le eliminați.\n\nPentru mai multe informații despre aceste certificate, contactați administratorul.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a instalat o autoritate de certificare pentru profilul dvs. de serviciu, ceea ce îi poate permite să monitorizeze activitatea în rețeaua de serviciu, inclusiv e-mailurile, aplicațiile și site-urile securizate. Puteți alege să setați certificatele ca fiind de încredere sau să le eliminați.\n\nPentru mai multe informații despre aceste certificate, contactați administratorul.</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 50d728d..8f031f4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="many">Одобрите или удалите сертификаты</item>
       <item quantity="other">Одобрите или удалите сертификаты</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Администратор домена <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> установил сертификаты ЦС для рабочего профиля. Это позволяет ему отслеживать ваши действия в рабочей сети, включая использование электронной почты и приложений, а также просмотр веб-сайтов. Вы можете одобрить или удалить сертификаты.\n\nЗа дополнительной информацией обращайтесь к администратору.</item>
       <item quantity="few">Администратор домена <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> установил сертификаты ЦС для рабочего профиля. Это позволяет ему отслеживать ваши действия в рабочей сети, включая использование электронной почты и приложений, а также просмотр веб-сайтов. Вы можете одобрить или удалить сертификаты.\n\nЗа дополнительной информацией обращайтесь к администратору.</item>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 0ba2466..13d7fd5 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -2267,6 +2267,7 @@
       <item quantity="one">සහතික විශ්වාස කරන්න හෝ ඉවත් කරන්න</item>
       <item quantity="other">සහතික විශ්වාස කරන්න හෝ ඉවත් කරන්න</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ඔබේ කාර්යාල පැතිකඩ සඳහා සහතික අධිකාරි ස්ථාපනය කර ඇත, එය ඔවුන්ට ඊ-තැපැල්, යොදුම්, සහ ආරක්ෂිත වෙබ් අඩවි ඇතුළු, කාර්යාල ජාල ක්‍රියාකාරකම් නිරීක්ෂණය කිරීමට ඉඩ දිය හැකිය. ඔබට මෙම සහතික විශ්වාස කිරීමට හෝ ඉවත් කිරීමට තේරීමට හැකිය.\n\nමෙම සහතික ගැන තවත් තොරතුරු සඳහා, ඔබේ පරිපාලක අමතන්න.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ඔබේ කාර්යාල පැතිකඩ සඳහා සහතික අධිකාරි ස්ථාපනය කර ඇත, එය ඔවුන්ට ඊ-තැපැල්, යොදුම්, සහ ආරක්ෂිත වෙබ් අඩවි ඇතුළු, කාර්යාල ජාල ක්‍රියාකාරකම් නිරීක්ෂණය කිරීමට ඉඩ දිය හැකිය. ඔබට මෙම සහතික විශ්වාස කිරීමට හෝ ඉවත් කිරීමට තේරීමට හැකිය.\n\nමෙම සහතික ගැන තවත් තොරතුරු සඳහා, ඔබේ පරිපාලක අමතන්න.</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b3d52b2..6e19d3d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="other">Nastavte certifikáty ako dôveryhodné alebo ich odstráňte</item>
       <item quantity="one">Nastavte certifikát ako dôveryhodný alebo ho odstráňte</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="few">Doména <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> nainštalovala pre váš pracovný profil certifikačné autority, ktoré jej môžu umožniť monitorovať aktivitu v pracovnej sieti vrátane pošty, aplikácií a zabezpečených webov. Môžete si vybrať, či chcete týmto certifikátom dôverovať alebo ich môžete odstrániť.\n\nĎalšie informácie o týchto certifikátoch získate od svojho správcu.</item>
       <item quantity="many">Doména <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>nainštalovala pre váš pracovný profil certifikačné autority, ktoré jej môžu umožniť monitorovať aktivitu v pracovnej sieti vrátane pošty, aplikácií a zabezpečených webov. Môžete si vybrať, či chcete týmto certifikátom dôverovať alebo ich môžete odstrániť.\n\nĎalšie informácie o týchto certifikátoch získate od svojho správcu.</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7941a39..4b51950 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="few">Označevanje potrdil kot zaupanja vrednih ali odstranitev potrdil</item>
       <item quantity="other">Označevanje potrdil kot zaupanja vrednih ali odstranitev potrdil</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Skrbnik domene <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je namestil overitelje potrdil za vaš delovni profil, s čimer morda lahko spremlja dejavnost v službenem omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti. Ta potrdila lahko označite kot zaupanja vredna ali jih odstranite.\n\nČe želite več informacij o teh potrdilih, se obrnite na skrbnika.</item>
       <item quantity="two">Skrbnik domene <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je namestil overitelje potrdil za vaš delovni profil, s čimer morda lahko spremlja dejavnost v službenem omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti. Ta potrdila lahko označite kot zaupanja vredna ali jih odstranite.\n\nČe želite več informacij o teh potrdilih, se obrnite na skrbnika.</item>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 50b0992..6164743 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Besoji ose hiqi certifikatat</item>
       <item quantity="one">Besoje ose hiqe certifikatën</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ka instaluar autoritete certifikate për profilin tënd të punës, që mund ta lejojë atë të monitorojë aktivitetin tënd të rrjetit të punës, duke përfshirë mail-et, aplikacionet dhe sajtet e sigurta të uebit. Mund të zgjedhësh t\'i besosh ose t\'i heqësh këto certifikata.\n\nPër më shumë informacion rreth kësaj certifikate, kontakto me administratorin.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ka instaluar një autoritet certifikate për profilin tënd të punës, që mund ta lejojë atë të monitorojë aktivitetin tënd të rrjetit të punës, duke përfshirë mail-et, aplikacionet dhe sajtet e sigurta të uebit. Mund të zgjedhësh ta besosh ose ta heqësh këtë certifikatë.\n\nPër më shumë informacion rreth kësaj certifikate, kontakto me administratorin.</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a849543..ca00d54 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2283,6 +2283,7 @@
       <item quantity="few">Означите сертификате као поуздане или их уклоните</item>
       <item quantity="other">Означите сертификате као поуздане или их уклоните</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> је инсталирао ауторитете за издавање сертификата за ваш профил за Work, што може да им омогућит да прате рад пословне мреже, укључујући имејлове, апликације и безбедне веб-сајтове. Можете да означите ове сертификате као поуздане или да их уклоните.\n\nКонтактирајте администратора да бисте сазнали додатне информације о овим сертификатима.</item>
       <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> је инсталирао ауторитете за издавање сертификата за ваш профил за Work, што може да им омогућит да прате рад пословне мреже, укључујући имејлове, апликације и безбедне веб-сајтове. Можете да означите ове сертификате као поуздане или да их уклоните.\n\nКонтактирајте администратора да бисте сазнали додатне информације о овим сертификатима.</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e9d9df7..cabc371 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Lita på eller ta bort certifikaten</item>
       <item quantity="one">Lita på eller ta bort certifikatet</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> har installerat certifikatutfärdare för jobbprofilen. Detta innebär att nätverksaktivitet på jobbet, som e-postmeddelanden, appar och säkra webbplatser kan kontrolleras. Du kan välja om du vill lita på eller ta bort certifikaten.\n\nKontakta administratören om du vill veta mer om certifikaten.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> har installerat en certifikatutfärdare för jobbprofilen. Detta innebär att nätverksaktivitet på jobbet, som e-postmeddelanden, appar och säkra webbplatser kan kontrolleras. Du kan välja om du vill lita på eller ta bort certifikatet.\n\nKontakta administratören om du vill veta mer om certifikatet.</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 77cbb1b..6f08038 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2271,6 +2271,7 @@
       <item quantity="other">Tumia au uondoe vyeti</item>
       <item quantity="one">Tumia au uondoe cheti</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>wamesakinisha mamlaka ya cheti ya wasifu wako wa kazini, huenda ikawaruhusu kuchunguza shughuli za mtandao wa kazini, ikiwa ni pamoja na barua pepe, programu na tovuti salama. Unaweza kuchagua kutumia au kuondoa vyeti hizi.\n\nKwa maelezo zaidi kuhusu vyeti hivi, wasiliana na msimamizi wako.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g>amesakinisha mamlaka ya cheti cha wasifu wako wa kazini, huenda ikamruhusu kuchunguza shughuli za mtandao wa kazini, ikiwa ni pamoja na barua pepe, programu na tovuti salama. Unaweza kuchagua kutumia au kuondoa cheti hiki.\n\nKwa maelezo zaidi kuhusu cheti hiki, wasiliana na msimamizi wako.</item>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sw360dp/aliases.xml
new file mode 100644
index 0000000..a10585b
--- /dev/null
+++ b/res/values-sw360dp/aliases.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+</resources>
+
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 78256ff..5ce51ec 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">சான்றிதழ்களை நம்பு அல்லது அகற்று</item>
       <item quantity="one">சான்றிதழை நம்பு அல்லது அகற்று</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரங்களை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அவற்றை அனுமதிக்கக்கூடும். நீங்கள் இந்தச் சான்றிதழ்களை நம்புவதற்கு அல்லது அகற்றுவதற்குத் தேர்வுசெய்யலாம்.\n\nசான்றிதழ்களைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அதை அனுமதிக்கக்கூடும். நீங்கள் இந்தச் சான்றிதழை நம்புவதற்கு அல்லது அகற்றுவதற்குத் தேர்வுசெய்யலாம்.\n\nசான்றிதழைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index c973085..e6cef65 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">ప్రమాణపత్రాలను విశ్వసించండి లేదా తీసివేయండి</item>
       <item quantity="one">ప్రమాణపత్రాన్ని విశ్వసించండి లేదా తీసివేయండి</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం ప్రమాణపత్ర అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు. మీరు ఈ ప్రమాణపత్రాలను విశ్వసించడం లేదా తీసివేయడం ఎంచుకోవచ్చు.\n\nఈ ప్రమాణపత్రాల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకుడిని సంప్రదించండి.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం ప్రమాణపత్ర అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు. మీరు ఈ ప్రమాణపత్రాన్ని విశ్వసించడం లేదా తీసివేయడం ఎంచుకోవచ్చు.\n\nఈ ప్రమాణపత్రం గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకుడిని సంప్రదించండి.</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index efc548e..b829348 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">เชื่อถือหรือนำใบรับรองออก</item>
       <item quantity="one">เชื่อถือหรือนำใบรับรองออก</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ได้ติดตั้งใบรับรอง CA สำหรับโปรไฟล์งานของคุณ ซึ่งอาจช่วยให้เขาตรวจสอบกิจกรรมในเครือข่ายการทำงานได้ ซึ่งรวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัย คุณเลือกที่จะเชื่อถือหรือนำใบรับรองเหล่านี้ออกได้\n\nโปรดติดต่อผู้ดูแลระบบของคุณสำหรับข้อมูลเพิ่มเติมเกี่ยวกับใบรับรองเหล่านี้</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ได้ติดตั้งใบรับรอง CA สำหรับโปรไฟล์งานของคุณ ซึ่งอาจช่วยให้เขาตรวจสอบกิจกรรมในเครือข่ายการทำงานได้ ซึ่งรวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัย คุณเลือกที่จะเชื่อถือหรือนำใบรับรองนี้ออกได้\n\nโปรดติดต่อผู้ดูแลระบบของคุณสำหรับข้อมูลเพิ่มเติมเกี่ยวกับใบรับรองนี้</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5797358..337e8c2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="one">Pagkatiwalaan o alisin ang mga certificate</item>
       <item quantity="other">Pagkatiwalaan o alisin ang mga certificate</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Nag-install ang <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ng mga certificate authority para sa iyong profile sa trabaho, na maaaring magbigay-daan dito na masubaybayan ang aktibidad sa network ng trabaho, kasama ang mga email, app at secure na website. Maaari mong piliing pagkatiwalaan o alisin ang mga certificate na ito.\n\nUpang makakuha ng karagdagang impormasyon tungkol sa mga certificate na ito, makipag-ugnayan sa iyong admin.</item>
       <item quantity="other">Nag-install ang <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ng mga certificate authority para sa iyong profile sa trabaho, na maaaring magbigay-daan dito na masubaybayan ang aktibidad sa network ng trabaho, kasama ang mga email, app at secure na website. Maaari mong piliing pagkatiwalaan o alisin ang mga certificate na ito.\n\nUpang makakuha ng karagdagang impormasyon tungkol sa mga certificate na ito, makipag-ugnayan sa iyong admin.</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f8cbdde..66f738d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Sertifikalara güvenin veya sertifikaları kaldırın</item>
       <item quantity="one">Sertifikaya güvenin veya sertifikayı kaldırın</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> yöneticisi, iş profiliniz için sertifika yetkilileri yükledi. Yönetici, bu sertifikalarla e-postalar, uygulamalar ve güvenli web siteleri de dahil olmak üzere iş ağı etkinliğini izleyebilir. Bu sertifikalara güvenmeyi veya bu sertifikaları kaldırmayı seçebilirsiniz.\n\nBu sertifikalar hakkında daha fazla bilgi için yöneticinize başvurun.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> yöneticisi, iş profiliniz için bir sertifika yetkilisi yükledi. Yönetici, bu sertifikayla e-postalar, uygulamalar ve güvenli web siteleri de dahil olmak üzere iş ağı etkinliğini izleyebilir. Bu sertifikaya güvenmeyi veya sertifikayı kaldırmayı seçebilirsiniz.\n\nBu sertifika hakkında daha fazla bilgi edinmek için yöneticinize başvurun.</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5c71a08..6c3de67 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2301,6 +2301,7 @@
       <item quantity="many">Зробити сертифікати надійними або вилучити їх</item>
       <item quantity="other">Зробити сертифікати надійними або вилучити їх</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one">Адміністратор домену <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> установив для вашого робочого профілю центри сертифікації, за допомогою яких зможе відстежувати активність у корпоративній мережі, зокрема електронні листи, додатки та безпечні веб-сайти. Ви можете зробити ці сертифікати надійними або вилучити їх.\n\nЩоб дізнатися більше про ці сертифікати, зв’яжіться зі своїм адміністратором.</item>
       <item quantity="few">Адміністратор домену <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> установив для вашого робочого профілю центри сертифікації, за допомогою яких зможе відстежувати активність у корпоративній мережі, зокрема електронні листи, додатки та безпечні веб-сайти. Ви можете зробити ці сертифікати надійними або вилучити їх.\n\nЩоб дізнатися більше про ці сертифікати, зв’яжіться зі своїм адміністратором.</item>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index aca3404..202d1cc 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">بھروسہ کریں یا سرٹیفیکیٹس ہٹائیں</item>
       <item quantity="one">بھروسہ کریں یا سرٹیفیکیٹ ہٹائیں</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> نے آپ کے دفتری پروفائل کیلئے سرٹیفیکیٹ اتھارٹیز انسٹال کی ہیں جو انہیں دفتری نیٹورک کی سرگرمی بشمول ای میلز، ایپس اور محفوظ ویب سائٹس مانیٹر کرنے کی اجازت دے سکتی ہیں۔ آپ ان سرٹیفیکیٹس پر بھروسہ کرنے یا ہٹانے کا انتخاب کر سکتے ہیں۔\n\nان سرٹیفیکیٹس سے متعلق مزید معلومات کیلئے اپنے منتظم سے رابطہ کریں۔</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> نے آپ کے دفتری پروفائل کیلئے سرٹیفیکیٹ اتھارٹی انسٹال کی ہے جو انہیں دفتری نیٹورک کی سرگرمی بشمول ای میلز، ایپس اور محفوظ ویب سائٹس مانیٹر کرنے کی اجازت دے سکتی ہے۔ آپ اس سرٹیفیکیٹ پر بھروسہ کرنے یا ہٹانے کا انتخاب کر سکتے ہیں۔\n\nاس سرٹیفیکیٹ سے متعلق مزید معلومات کیلئے اپنے منتظم سے رابطہ کریں۔</item>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 350a125..da57435 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Sertifikatlarni ishonchli deb belgilash yoki o‘chirib tashlash</item>
       <item quantity="one">Sertifikatni ishonchli deb belgilash yoki o‘chirib tashlash</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> domeni administratori ishchi profilingiz uchun sertifikatlar o‘rnatdi. Bularning yordamida korporativ tarmoq faoliyatini, jumladan, e-pochtalar, ilovalar va xavfsiz saytlarni nazorat qilishi mumkin. Siz bu sertifikatlarni ishonchli deb belgilashingiz yoki o‘chirib tashlashingiz mumkin.\n\nBu sertifikatlar haqida batafsil ma’lumot olish uchun administratoringiz bilan bog‘laning.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> domeni administratori ishchi profilingiz uchun sertifikat o‘rnatdi. Buning yordamida korporativ tarmoq faoliyatini, jumladan, e-pochtalar, ilovalar va xavfsiz saytlarni nazorat qilishi mumkin. Siz bu sertifikatni ishonchli deb belgilashingiz yoki o‘chirib tashlashingiz mumkin.\n\nBu sertifikat haqida batafsil ma’lumot olish uchun administratoringiz bilan bog‘laning.</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f02c313..0755671 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">Tin tưởng hoặc xóa chứng chỉ</item>
       <item quantity="one">Tin tưởng hoặc xóa chứng chỉ</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> đã cài đặt các tổ chức phát hành chứng chỉ cho hồ sơ công việc của bạn, chứng chỉ này có thể cho phép các tổ chức này giám sát hoạt động trên mạng công việc, bao gồm email, ứng dụng và trang web bảo mật. Bạn có thể chọn tin tưởng hoặc xóa các chứng chỉ này.\n\nĐể biết thêm thông tin về các chứng chỉ này, hãy liên hệ với quản trị viên của bạn.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> đã cài đặt tổ chức phát hành chứng chỉ cho hồ sơ công việc của bạn, chứng chỉ này có thể cho phép tổ chức này giám sát hoạt động trên mạng công việc, bao gồm email, ứng dụng và trang web bảo mật. Bạn có thể chọn tin tưởng hoặc xóa chứng chỉ này.\n\nĐể biết thêm thông tin về chứng chỉ này, hãy liên hệ với quản trị viên của bạn.</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d56e07a..71f8102 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2265,6 +2265,7 @@
       <item quantity="other">信任或移除证书</item>
       <item quantity="one">信任或移除证书</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已为您的工作资料安装多个证书授权中心，这可能会允许证书授权中心监控您的工作网络活动（包括使用电子邮件、应用和安全网站）。您可以选择信任这些证书，也可以选择移除这些证书。\n\n如需详细了解这些证书，请与您的管理员联系。</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已为您的工作资料安装一个证书授权中心，这可能会允许证书授权中心监控您的工作网络活动（包括使用电子邮件、应用和安全网站）。您可以选择信任此证书，也可以选择移除此证书。\n\n如需详细了解此证书，请与您的管理员联系。</item>
@@ -3084,24 +3085,14 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"付费短信权限"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"已停用"</string>
     <string name="demo_mode" msgid="2655748420527206870">"演示模式"</string>
-    <!-- no translation found for managed_profile_settings_title (2729481936758125054) -->
-    <skip />
-    <!-- no translation found for managed_profile_contact_search_title (6034734926815544221) -->
-    <skip />
-    <!-- no translation found for managed_profile_contact_search_summary (5431253552272970512) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_computer (4875089335641234463) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_headset (5140152177885220949) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_phone (4260255181240622896) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_imaging (551146170554589119) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_headphone (26580326066627664) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_input_peripheral (5165842622743212268) -->
-    <skip />
-    <!-- no translation found for bluetooth_talkback_bluetooth (5615463912185280812) -->
-    <skip />
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作资料设置"</string>
+    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"联系人搜索"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允许您的单位搜索联系人，以便识别来电者和联系人的身份"</string>
+    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"计算机"</string>
+    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"耳麦"</string>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"手机"</string>
+    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"成像设备"</string>
+    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"耳机"</string>
+    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"外围输入设备"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"蓝牙"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a6a8908..40dee02 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2270,6 +2270,7 @@
       <item quantity="other">信任或移除憑證</item>
       <item quantity="one">信任或移除憑證</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為您的工作設定檔安裝憑證，這可能允許憑證核發當局監察電郵、應用程式和安全網站等工作網絡活動。您可以選擇信任或移除此憑證。\n\n如需進一步瞭解此憑證，請聯絡您的管理員。</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為您的工作設定檔安裝憑證，這可能允許憑證核發當局監察電郵、應用程式和安全網站等工作網絡活動。您可以選擇信任或移除此憑證。\n\n如需進一步瞭解此憑證，請聯絡您的管理員。</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2e9b260..9fc4da7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2269,6 +2269,7 @@
       <item quantity="other">設為信任的憑證或移除憑證</item>
       <item quantity="one">設為信任的憑證或移除憑證</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為您的 Work 設定檔安裝多個授權憑證，這些憑證將能監控您的 Work 網路活動，包括電子郵件、應用程式和安全的網站。您可以選擇將這些憑證設為信任的來源或將其移除。\n\n如要進一步瞭解這些憑證，請與您的管理員聯絡。</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為您的 Work 設定檔安裝一個授權憑證，該憑證將能監控您的 Work 網路活動，包括電子郵件、應用程式和安全的網站。您可以選擇將這個憑證設為信任的來源或將其移除。\n\n如要進一步瞭解這個憑證，請與您的管理員聯絡。</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 553f7bb..399bd39 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2266,6 +2266,7 @@
       <item quantity="one">Themba noma susa izitifiketi</item>
       <item quantity="other">Themba noma susa izitifiketi</item>
     </plurals>
+    <!-- no translation found for ssl_ca_cert_info_message_device_owner (7392268444365783975) -->
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ufake ukugunyaza kwesitifiketi kwephrofayela yakho yomsebenzi, okungakuvumela ukuthi kuhlole umsebenzi wenethiwekhi, kufaka phakathi ama-imeyili, izinhlelo zokusebenza, nokuvikela amawebhusayithi. Ungakhetha ukwethemba noma ususe lesi zitifiketi.\n\nNgolwazi olubanzi mayelana nalezi zitifiketi, xhumana nomlawuli wakho.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ufake ukugunyaza kwesitifiketi kwephrofayela yakho yomsebenzi, okungakuvumela ukuthi kuhlole umsebenzi wenethiwekhi, kufaka phakathi ama-imeyili, izinhlelo zokusebenza, nokuvikela amawebhusayithi. Ungakhetha ukwethemba noma ususe lesi zitifiketi.\n\nNgolwazi olubanzi mayelana nalezi zitifiketi, xhumana nomlawuli wakho.</item>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 0901157..a783c79 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -23,5 +23,6 @@
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
      <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
      <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
+     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template_short</item>
 </resources>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51c54c9..11bda60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5318,7 +5318,12 @@
         <item quantity="one">Trust or remove certificate</item>
         <item quantity="other">Trust or remove certificates</item>
     </plurals>
-    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <!-- Text of message to show to device owner user whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <plurals name="ssl_ca_cert_info_message_device_owner">
+        <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
+        <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
+    </plurals>
+    <!-- Text of message to show to work profile users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
     <plurals name="ssl_ca_cert_info_message">
         <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
         <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1cd5fbb..bfe2d1c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -228,6 +228,10 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
+    <style name="wifi_item_spinner" parent="wifi_item_content">
+        <item name="android:minHeight">48dp</item>
+    </style>
+
     <style name="wifi_advanced_toggle" parent="wifi_item_content">
         <item name="android:background">@null</item>
         <item name="android:button">@null</item>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 40a8569..ee9237c 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -17,8 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/app_notifications_title"
-        android:key="app_notification_settings"
-        settings:keywords="@string/keywords_date_and_time">
+        android:key="app_notification_settings">
 
     <!-- Importance -->
     <!-- Block -->
@@ -43,7 +42,7 @@
             android:order="4"/>
 
     <!-- Visibility Override -->
-    <DropDownPreference
+    <com.android.settings.notification.RestrictedDropDownPreference
             android:key="visibility_override"
             android:title="@string/app_notification_visibility_override_title"
             android:order="5" />
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index b42f17b..61b4260 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -17,9 +17,11 @@
 package com.android.settings;
 
 import android.app.AlertDialog;
+import android.app.AppGlobals;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -27,6 +29,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.AttributeSet;
@@ -195,15 +198,16 @@
         int selectedIndex = -1;
         for (int i = 0; i < componentNames.length; i++) {
             try {
-                ApplicationInfo appInfo = pm.getApplicationInfoAsUser(
-                        componentNames[i].getPackageName().toString(), 0, mUserId);
-                applicationNames.add(appInfo.loadLabel(pm));
+                ActivityInfo activityInfo = AppGlobals.getPackageManager().getActivityInfo(
+                        componentNames[i], 0, mUserId);
+                if (activityInfo == null) continue;
+                applicationNames.add(activityInfo.loadLabel(pm));
                 validatedComponentNames.add(componentNames[i].flattenToString());
-                entryDrawables.add(appInfo.loadIcon(pm));
+                entryDrawables.add(activityInfo.loadIcon(pm));
                 if (defaultCN != null && componentNames[i].equals(defaultCN)) {
                     selectedIndex = i;
                 }
-            } catch (NameNotFoundException e) {
+            } catch (RemoteException e) {
                 // Skip unknown packages.
             }
         }
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 594cd38..4214343 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -341,7 +341,6 @@
     final private static int sWidgetsToDisable = StatusBarManager.DISABLE_EXPAND
             | StatusBarManager.DISABLE_NOTIFICATION_ICONS
             | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-            | StatusBarManager.DISABLE_SYSTEM_INFO
             | StatusBarManager.DISABLE_HOME
             | StatusBarManager.DISABLE_SEARCH
             | StatusBarManager.DISABLE_RECENT;
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 2b96dbe..1fd8451 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -749,7 +749,7 @@
             ArrayList<String> options = new ArrayList<String>();
             ArrayList<String> values = new ArrayList<String>();
             for(int n = 0; n < providers.length; n++) {
-                if (isPackageEnabled(providers[n].packageName)) {
+                if (Utils.isPackageEnabled(getActivity(), providers[n].packageName)) {
                     options.add(providers[n].description);
                     values.add(providers[n].packageName);
                 }
@@ -1929,15 +1929,6 @@
                 requestCode, resources.getString(R.string.oem_unlock_enable));
     }
 
-    private boolean isPackageEnabled(String packageName) {
-        try {
-            return getActivity().getPackageManager().getApplicationInfo(packageName, 0).enabled;
-        } catch (NameNotFoundException e) {
-            // Thrown by PackageManager.getApplicationInfo if the package does not exist
-        }
-        return false;
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index 7bf5768..8ad9d83 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -29,15 +29,20 @@
 
 /**
  * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
- * traffic. This activity should be launched for the user into which the CA cert is installed.
+ * traffic. This activity should be launched for the user into which the CA cert is installed
+ * unless Intent.EXTRA_USER_ID is provided.
  */
 public class MonitoringCertInfoActivity extends Activity implements OnClickListener,
         OnDismissListener {
 
+    private int mUserId;
+
     @Override
     protected void onCreate(Bundle savedStates) {
         super.onCreate(savedStates);
 
+        mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
         DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
         final int numberOfCertificates = getIntent().getIntExtra(
                 Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);
@@ -53,12 +58,13 @@
         builder.setNeutralButton(R.string.cancel, null);
         builder.setOnDismissListener(this);
 
-        if (dpm.getProfileOwner() != null) {
+        if (dpm.getProfileOwnerAsUser(mUserId) != null) {
             builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
                     numberOfCertificates, dpm.getProfileOwnerName()));
         } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
-            builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
-                    numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser()));
+            builder.setMessage(getResources().getQuantityString(
+                    R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,
+                    dpm.getDeviceOwnerNameOnAnyUser()));
         } else  {
             // Consumer case.  Show scary warning.
             builder.setIcon(android.R.drawable.stat_notify_error);
@@ -72,7 +78,7 @@
     public void onClick(DialogInterface dialog, int which) {
         Intent intent = new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER, UserHandle.myUserId());
+        intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER, mUserId);
         startActivity(intent);
         finish();
     }
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
index c259e26..d06a374 100644
--- a/src/com/android/settings/PointerSpeedPreference.java
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -141,7 +141,6 @@
         SavedState myState = (SavedState) state;
         super.onRestoreInstanceState(myState.getSuperState());
         mOldSpeed = myState.oldSpeed;
-        mSeekBar.setProgress(myState.progress);
         mIm.tryPointerSpeed(myState.progress + InputManager.MIN_POINTER_SPEED);
     }
 
diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java
new file mode 100644
index 0000000..476df29
--- /dev/null
+++ b/src/com/android/settings/RestrictedCheckBox.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.util.AttributeSet;
+import android.widget.CheckBox;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import com.android.settingslib.RestrictedLockUtils;
+
+/**
+ * A checkbox that can be restricted by device policy, in which case it shows a dialog explaining
+ * what component restricted it.
+ */
+public class RestrictedCheckBox extends CheckBox {
+    private Context mContext;
+    private boolean mDisabledByAdmin;
+    private EnforcedAdmin mEnforcedAdmin;
+
+    public RestrictedCheckBox(Context context) {
+        this(context, null);
+    }
+
+    public RestrictedCheckBox(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+    }
+
+    @Override
+    public boolean performClick() {
+        if (mDisabledByAdmin) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
+            return true;
+        }
+        return super.performClick();
+    }
+
+    public void setDisabledByAdmin(EnforcedAdmin admin) {
+        final boolean disabled = (admin != null);
+        mEnforcedAdmin = admin;
+        if (mDisabledByAdmin != disabled) {
+            mDisabledByAdmin = disabled;
+            RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext, this, mDisabledByAdmin);
+            if (mDisabledByAdmin) {
+                getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
+                        PorterDuff.Mode.MULTIPLY);
+            } else {
+                getButtonDrawable().clearColorFilter();
+            }
+        }
+    }
+
+    public boolean isDisabledByAdmin() {
+        return mDisabledByAdmin;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 72dacd5..d96f459 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -1213,6 +1213,7 @@
                 } catch (NumberFormatException e) {
                     Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
                 }
+                setupLockAfterPreference();
                 updateLockAfterPreferenceSummary();
             } else if (KEY_VISIBLE_PATTERN.equals(key)) {
                 mLockPatternUtils.setVisiblePatternEnabled((Boolean) value, MY_USER_ID);
diff --git a/src/com/android/settings/ManagedProfileSetup.java b/src/com/android/settings/SettingsInitialize.java
similarity index 78%
rename from src/com/android/settings/ManagedProfileSetup.java
rename to src/com/android/settings/SettingsInitialize.java
index ac012b0..07fec07 100644
--- a/src/com/android/settings/ManagedProfileSetup.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -36,10 +36,11 @@
 
 /**
  * Listens to {@link Intent.ACTION_BOOT_COMPLETED} and {@link Intent.ACTION_PRE_BOOT_COMPLETED}
- * performs setup steps for a managed profile (disables the launcher icon of the Settings app and
- * adds cross-profile intent filters for the appropriate Settings activities).
+ * performs setup steps for a managed profile (disables the launcher icon of the Settings app,
+ * adds cross-profile intent filters for the appropriate Settings activities), and disables the
+ * webview setting for non-admin users.
  */
-public class ManagedProfileSetup extends BroadcastReceiver {
+public class SettingsInitialize extends BroadcastReceiver {
     private static final String TAG = "Settings";
     private static final String PRIMARY_PROFILE_SETTING =
             "com.android.settings.PRIMARY_PROFILE_CONTROLLED";
@@ -48,12 +49,18 @@
     public void onReceive(Context context, Intent broadcast) {
         final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
         UserInfo userInfo = um.getUserInfo(UserHandle.myUserId());
+        final PackageManager pm  = context.getPackageManager();
+        managedProfileSetup(context, pm, broadcast, userInfo);
+        webviewSettingSetup(context, pm, userInfo);
+    }
+
+    private void managedProfileSetup(Context context, final PackageManager pm, Intent broadcast,
+            UserInfo userInfo) {
         if (userInfo == null || !userInfo.isManagedProfile()) {
             return;
         }
         Log.i(TAG, "Received broadcast: " + broadcast.getAction()
                 + ". Setting up intent forwarding for managed profile.");
-        final PackageManager pm  = context.getPackageManager();
         // Clear any previous intent forwarding we set up
         pm.clearCrossProfileIntentFilters(userInfo.id);
 
@@ -86,4 +93,18 @@
         pm.setComponentEnabledSetting(settingsComponentName,
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
     }
+
+    // Disable WebView Setting if the current user is not an admin
+    private void webviewSettingSetup(Context context, PackageManager pm, UserInfo userInfo) {
+        if (userInfo == null) {
+            return;
+        }
+        ComponentName settingsComponentName =
+            new ComponentName(context, WebViewImplementation.class);
+        pm.setComponentEnabledSetting(settingsComponentName,
+                userInfo.isAdmin() ?
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
 }
diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
index ed2ab09..2508d8c 100644
--- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java
+++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
@@ -43,6 +43,7 @@
     public interface DelegateInterface {
         List<X509Certificate> getX509CertsFromCertHolder(CertHolder certHolder);
         void removeOrInstallCert(CertHolder certHolder);
+        boolean startConfirmCredentialIfNotConfirmed(int userId);
     }
 
     private final DialogEventHandler mDialogEventHandler;
@@ -144,8 +145,10 @@
 
         private void onClickTrust() {
             CertHolder certHolder = getCurrentCertInfo();
-            mDpm.approveCaCert(certHolder.getAlias(), certHolder.getUserId(), true);
-            nextOrDismiss();
+            if (!mDelegate.startConfirmCredentialIfNotConfirmed(certHolder.getUserId())) {
+                mDpm.approveCaCert(certHolder.getAlias(), certHolder.getUserId(), true);
+                nextOrDismiss();
+            }
         }
 
         private void onClickRemove() {
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index e7ab406..c630ed6 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.annotation.UiThread;
+import android.app.Activity;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
@@ -79,8 +80,10 @@
     private KeyguardManager mKeyguardManager;
     private int mTrustAllCaUserId;
 
-
+    private static final String SAVED_CONFIRMED_CREDENTIAL_USERS = "ConfirmedCredentialUsers";
+    private static final String SAVED_CONFIRMING_CREDENTIAL_USER = "ConfirmingCredentialUser";
     private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
+    private static final int REQUEST_CONFIRM_CREDENTIALS = 1;
 
     @Override
     protected int getMetricsCategory() {
@@ -154,6 +157,8 @@
     private TabHost mTabHost;
     private ArrayList<GroupAdapter> mGroupAdapters = new ArrayList<>(2);
     private AliasOperation mAliasOperation;
+    private ArraySet<Integer> mConfirmedCredentialUsers;
+    private int mConfirmingCredentialUser;
     private Set<AdapterData.AliasLoader> mAliasLoaders = new ArraySet<AdapterData.AliasLoader>(2);
     private final SparseArray<KeyChainConnection>
             mKeyChainConnectionByProfileId = new SparseArray<KeyChainConnection>();
@@ -182,6 +187,17 @@
                 .getSystemService(Context.KEYGUARD_SERVICE);
         mTrustAllCaUserId = getActivity().getIntent().getIntExtra(ARG_SHOW_NEW_FOR_USER,
                 UserHandle.USER_NULL);
+        mConfirmedCredentialUsers = new ArraySet<>(2);
+        mConfirmingCredentialUser = UserHandle.USER_NULL;
+        if (savedInstanceState != null) {
+            mConfirmingCredentialUser = savedInstanceState.getInt(SAVED_CONFIRMING_CREDENTIAL_USER,
+                    UserHandle.USER_NULL);
+            ArrayList<Integer> users = savedInstanceState.getIntegerArrayList(
+                    SAVED_CONFIRMED_CREDENTIAL_USERS);
+            if (users != null) {
+                mConfirmedCredentialUsers.addAll(users);
+            }
+        }
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
@@ -190,6 +206,14 @@
         getActivity().registerReceiver(mWorkProfileChangedReceiver, filter);
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putIntegerArrayList(SAVED_CONFIRMED_CREDENTIAL_USERS, new ArrayList<>(
+                mConfirmedCredentialUsers));
+        outState.putInt(SAVED_CONFIRMING_CREDENTIAL_USER, mConfirmingCredentialUser);
+    }
+
     @Override public View onCreateView(
             LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         mTabHost = (TabHost) inflater.inflate(R.layout.trusted_credentials, parent, false);
@@ -219,6 +243,16 @@
         super.onDestroy();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CONFIRM_CREDENTIALS) {
+            if (resultCode == Activity.RESULT_OK) {
+                mConfirmedCredentialUsers.add(mConfirmingCredentialUser);
+            }
+            mConfirmingCredentialUser = UserHandle.USER_NULL;
+        }
+    }
+
     private void closeKeyChainConnections() {
         final int n = mKeyChainConnectionByProfileId.size();
         for (int i = 0; i < n; ++i) {
@@ -262,14 +296,18 @@
     }
 
     /**
-     * Start work challenge activity. TODO: Move and refactor this method as a util function.
+     * Start work challenge activity.
+     * @return true if screenlock exists
      */
-    private void startWorkChallenge(int userId) {
+    private boolean startConfirmCredential(int userId) {
         final Intent newIntent = mKeyguardManager.createConfirmDeviceCredentialIntent(null, null,
                 userId);
-        newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getActivity().startActivity(newIntent);
+        if (newIntent == null) {
+            return false;
+        }
+        mConfirmingCredentialUser = userId;
+        startActivityForResult(newIntent, REQUEST_CONFIRM_CREDENTIALS);
+        return true;
     }
 
     /**
@@ -303,7 +341,8 @@
         }
         @Override
         public CertHolder getChild(int groupPosition, int childPosition) {
-            return mData.mCertHoldersByUserId.get(getUserIdByGroup(groupPosition)).get(childPosition);
+            return mData.mCertHoldersByUserId.get(getUserIdByGroup(groupPosition)).get(
+                    childPosition);
         }
         @Override
         public long getGroupId(int groupPosition) {
@@ -386,18 +425,27 @@
         }
 
         public boolean checkGroupExpandableAndStartWarningActivity(int groupPosition) {
+            return checkGroupExpandableAndStartWarningActivity(groupPosition, true);
+        }
+
+        public boolean checkGroupExpandableAndStartWarningActivity(int groupPosition,
+                boolean startActivity) {
             final UserHandle groupUser = getGroup(groupPosition);
             final int groupUserId = groupUser.getIdentifier();
             if (mUserManager.isQuietModeEnabled(groupUser)) {
                 final Intent intent = UnlaunchableAppActivity.createInQuietModeDialogIntent(
                         groupUserId);
-                getActivity().startActivity(intent);
+                if (startActivity) {
+                    getActivity().startActivity(intent);
+                }
                 return false;
             } else if (!mUserManager.isUserUnlocked(groupUser)) {
                 final LockPatternUtils lockPatternUtils = new LockPatternUtils(
                         getActivity());
                 if (lockPatternUtils.isSeparateProfileChallengeEnabled(groupUserId)) {
-                    startWorkChallenge(groupUserId);
+                    if (startActivity) {
+                        startConfirmCredential(groupUserId);
+                    }
                     return false;
                 }
             }
@@ -548,7 +596,8 @@
         }
 
         public void prepare() {
-            mIsListExpanded = checkGroupExpandableAndStartWarningActivity();
+            mIsListExpanded = mParent.checkGroupExpandableAndStartWarningActivity(mGroupPosition,
+                    false /* startActivity */);
             refreshViews();
         }
 
@@ -890,6 +939,15 @@
         new AliasOperation(certHolder).execute();
     }
 
+    @Override
+    public boolean startConfirmCredentialIfNotConfirmed(int userId) {
+        if (mConfirmedCredentialUsers.contains(userId)) {
+            // Credential has been confirmed. Don't start activity.
+            return false;
+        }
+        return startConfirmCredential(userId);
+    }
+
     private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
         private final CertHolder mCertHolder;
 
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index d972e07..4eaad7d 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -36,6 +36,7 @@
 import android.content.pm.IPackageManager;
 import android.content.pm.IntentFilterVerificationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
@@ -87,7 +88,6 @@
 import android.view.animation.AnimationUtils;
 import android.widget.ListView;
 import android.widget.TabWidget;
-
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.util.UserIcons;
 
@@ -1137,5 +1137,14 @@
         }
         return null;
     }
+
+    public static boolean isPackageEnabled(Context context, String packageName) {
+        try {
+            return context.getPackageManager().getApplicationInfo(packageName, 0).enabled;
+        } catch (NameNotFoundException e) {
+            // Thrown by PackageManager.getApplicationInfo if the package does not exist
+        }
+        return false;
+    }
 }
 
diff --git a/src/com/android/settings/WebViewImplementation.java b/src/com/android/settings/WebViewImplementation.java
new file mode 100644
index 0000000..c949a39
--- /dev/null
+++ b/src/com/android/settings/WebViewImplementation.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.annotation.Nullable;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserManager;
+import android.util.Log;
+import android.webkit.IWebViewUpdateService;
+import android.webkit.WebViewProviderInfo;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+
+import java.util.ArrayList;
+
+public class WebViewImplementation extends InstrumentedActivity implements
+        OnCancelListener, OnDismissListener {
+
+    private static final String TAG = "WebViewImplementation";
+
+    private IWebViewUpdateService mWebViewUpdateService;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (!UserManager.get(this).isAdminUser()) {
+            finish();
+            return;
+        }
+        mWebViewUpdateService  =
+                IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
+        try {
+            WebViewProviderInfo[] providers = mWebViewUpdateService.getValidWebViewPackages();
+            if (providers == null) {
+                Log.e(TAG, "No WebView providers available");
+                finish();
+                return;
+            }
+
+            String currentValue = mWebViewUpdateService.getCurrentWebViewPackageName();
+            if (currentValue == null) {
+                currentValue = "";
+            }
+
+            int currentIndex = -1;
+            ArrayList<String> options = new ArrayList<>();
+            final ArrayList<String> values = new ArrayList<>();
+            for (WebViewProviderInfo provider : providers) {
+                if (Utils.isPackageEnabled(this, provider.packageName)) {
+                    options.add(provider.description);
+                    values.add(provider.packageName);
+                    if (currentValue.contentEquals(provider.packageName)) {
+                        currentIndex = values.size() - 1;
+                    }
+                }
+            }
+
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.select_webview_provider_dialog_title)
+                    .setSingleChoiceItems(options.toArray(new String[0]), currentIndex,
+                            new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            try {
+                                mWebViewUpdateService.changeProviderAndSetting(values.get(which));
+                            } catch (RemoteException e) {
+                                Log.w(TAG, "Problem reaching webviewupdate service", e);
+                            }
+                            finish();
+                        }
+                    }).setNegativeButton(android.R.string.cancel, null)
+                    .setOnCancelListener(this)
+                    .setOnDismissListener(this)
+                    .show();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Problem reaching webviewupdate service", e);
+            finish();
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.WEBVIEW_IMPLEMENTATION;
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        finish();
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        finish();
+    }
+}
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index 59af46d..cfbb2fc 100644
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -92,7 +92,8 @@
                 .getUserId(uid)));
         try {
             permissionState.packageInfo = mIPackageManager.getPackageInfo(pkg,
-                    PackageManager.GET_PERMISSIONS, permissionState.userHandle.getIdentifier());
+                    PackageManager.GET_PERMISSIONS | PackageManager.MATCH_UNINSTALLED_PACKAGES,
+                    permissionState.userHandle.getIdentifier());
             // Check static permission state (whatever that is declared in package manifest)
             String[] requestedPermissions = permissionState.packageInfo.requestedPermissions;
             int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java
index 3687c05..76dcabc 100644
--- a/src/com/android/settings/applications/ConfirmConvertToFbe.java
+++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java
@@ -23,9 +23,11 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
-public class ConfirmConvertToFbe extends Fragment {
+public class ConfirmConvertToFbe extends SettingsPreferenceFragment {
     static final String TAG = "ConfirmConvertToFBE";
 
     @Override
@@ -45,4 +47,9 @@
 
         return rootView;
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.CONVERT_FBE_CONFIRM;
+    }
 }
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index f32c52b..c1e6576 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -16,27 +16,24 @@
 package com.android.settings.applications;
 
 import android.app.Activity;
-import android.app.Fragment;
-import android.content.res.Resources;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.RecoverySystem;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.settings.applications.ConfirmConvertToFbe;
+import com.android.internal.logging.MetricsProto;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.SettingsActivity;
 import com.android.settings.R;
-
-import java.io.IOException;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
 
 /* Class to prompt for conversion of userdata to file based encryption
  */
-public class ConvertToFbe extends Fragment {
+public class ConvertToFbe extends SettingsPreferenceFragment {
     static final String TAG = "ConvertToFBE";
     static final String CONVERT_FBE_EXTRA = "ConvertFBE";
     private static final int KEYGUARD_REQUEST = 55;
@@ -85,4 +82,9 @@
         sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null,
                                 R.string.convert_to_file_encryption, null, null, 0);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.CONVERT_FBE;
+    }
 }
diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java
index 3c81374..dd85dd2 100644
--- a/src/com/android/settings/applications/ProcStatsData.java
+++ b/src/com/android/settings/applications/ProcStatsData.java
@@ -160,7 +160,7 @@
                 ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES);
 
         createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals);
-        if (totalMem.sysMemZRamWeight > 0) {
+        if (totalMem.sysMemZRamWeight > 0 && !totalMem.hasSwappedOutPss) {
             distributeZRam(totalMem.sysMemZRamWeight);
         }
 
@@ -418,8 +418,10 @@
             memReader.readMemInfo();
             realTotalRam = memReader.getTotalSize();
             freeWeight = totalMem.sysMemFreeWeight + totalMem.sysMemCachedWeight;
-            usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight
-                    + totalMem.sysMemZRamWeight;
+            usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight;
+            if (!totalMem.hasSwappedOutPss) {
+                usedWeight += totalMem.sysMemZRamWeight;
+            }
             for (int i = 0; i < ProcessStats.STATE_COUNT; i++) {
                 if (i == ProcessStats.STATE_SERVICE_RESTARTING) {
                     // These don't really run.
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index 1841f13..f50f3ad 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -24,10 +24,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 
-public class RunningServices extends Fragment {
+public class RunningServices extends SettingsPreferenceFragment {
 
     private static final int SHOW_RUNNING_SERVICES = 1;
     private static final int SHOW_BACKGROUND_PROCESSES = 2;
@@ -105,6 +107,11 @@
         mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.RUNNING_SERVICES;
+    }
+
     private final Runnable mRunningProcessesAvail = new Runnable() {
         @Override
         public void run() {
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index fadc023..c54311a 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -80,9 +80,10 @@
     private Condition mExpandedCondition = null;
     private SuggestionParser mSuggestionParser;
 
-    public DashboardAdapter(Context context) {
+    public DashboardAdapter(Context context, SuggestionParser parser) {
         mContext = context;
         mCache = new IconCache(context);
+        mSuggestionParser = parser;
 
         setHasStableIds(true);
         setShowingAll(true);
@@ -92,9 +93,8 @@
         return mSuggestions;
     }
 
-    public void setSuggestions(List<Tile> suggestions, SuggestionParser parser) {
+    public void setSuggestions(List<Tile> suggestions) {
         mSuggestions = suggestions;
-        mSuggestionParser = parser;
         recountItems();
     }
 
@@ -283,6 +283,9 @@
     }
 
     public void disableSuggestion(Tile suggestion) {
+        if (mSuggestionParser == null) {
+            return;
+        }
         if (mSuggestionParser.dismissSuggestion(suggestion)) {
             mContext.getPackageManager().setComponentEnabledSetting(
                     suggestion.intent.getComponent(),
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 2e93880..18b941c 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -142,6 +142,9 @@
                 MetricsLogger.hidden(getContext(), c.getMetricsConstant());
             }
         }
+        if (mAdapter.getSuggestions() == null) {
+            return;
+        }
         for (Tile suggestion : mAdapter.getSuggestions()) {
             MetricsLogger.action(getContext(), MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                     DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));
@@ -188,7 +191,7 @@
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
         mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
-        mAdapter = new DashboardAdapter(getContext());
+        mAdapter = new DashboardAdapter(getContext(), mSuggestionParser);
         mAdapter.setConditions(mConditionManager.getConditions());
         mDashboard.setAdapter(mAdapter);
         mSummaryLoader.setAdapter(mAdapter);
@@ -240,7 +243,7 @@
 
         @Override
         protected void onPostExecute(List<Tile> tiles) {
-            mAdapter.setSuggestions(tiles, mSuggestionParser);
+            mAdapter.setSuggestions(tiles);
         }
     }
 }
diff --git a/src/com/android/settings/datausage/AppDataUsageActivity.java b/src/com/android/settings/datausage/AppDataUsageActivity.java
index 6f88d45..2b8e42d 100644
--- a/src/com/android/settings/datausage/AppDataUsageActivity.java
+++ b/src/com/android/settings/datausage/AppDataUsageActivity.java
@@ -20,6 +20,7 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settingslib.AppItem;
 
@@ -61,6 +62,7 @@
         args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
         intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
         intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName());
+        intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.app_data_usage);
 
         super.onCreate(savedInstanceState);
     }
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
index 5a4c7b1..7032a1d 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
@@ -29,11 +29,11 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
 
-public class PrivateVolumeUnmount extends InstrumentedFragment {
+public class PrivateVolumeUnmount extends SettingsPreferenceFragment {
     private VolumeInfo mVolume;
     private DiskInfo mDisk;
 
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index bd6f4fe..f718b3c 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -26,7 +26,6 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.service.notification.NotificationListenerService.Ranking;
-import android.support.v7.preference.DropDownPreference;
 import android.util.ArrayMap;
 import android.util.Log;
 
@@ -76,7 +75,7 @@
         mPriority =
                 (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BYPASS_DND);
         mVisibilityOverride =
-                (DropDownPreference) getPreferenceScreen().findPreference(
+                (RestrictedDropDownPreference) getPreferenceScreen().findPreference(
                         KEY_VISIBILITY_OVERRIDE);
         mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
         mSilent = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_SILENT);
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 9acac06..89aebf9 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -177,6 +178,9 @@
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
         }
 
+        mLockscreen.setRemoteInputRestricted(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+                mContext, DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT, UserHandle.myUserId()));
+
         mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
         mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
         updateLockscreenNotifications();
@@ -239,6 +243,10 @@
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
         }
 
+        mLockscreen.setRemoteInputRestricted(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+                mContext, DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT,
+                mProfileChallengeUserId));
+
         mLockscreenProfile.setEntries(entries.toArray(new CharSequence[entries.size()]));
         mLockscreenProfile.setEntryValues(values.toArray(new CharSequence[values.size()]));
         // Work profile does not support this settings as we do not have a policy to enforce it yet
diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java
index fc61be3..01eecf5 100644
--- a/src/com/android/settings/notification/NotificationLockscreenPreference.java
+++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java
@@ -19,6 +19,7 @@
 import com.android.settings.R;
 import com.android.settings.RestrictedListPreference;
 import com.android.settings.Utils;
+import com.android.settingslib.RestrictedLockUtils;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -32,6 +33,7 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
@@ -42,6 +44,7 @@
     private boolean mShowRemoteInput;
     private boolean mRemoteInputCheckBoxEnabled = true;
     private int mUserId = UserHandle.myUserId();
+    private RestrictedLockUtils.EnforcedAdmin mAdminRestrictingRemoteInput;
 
     public NotificationLockscreenPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -51,6 +54,10 @@
         mRemoteInputCheckBoxEnabled = enabled;
     }
 
+    public void setRemoteInputRestricted(RestrictedLockUtils.EnforcedAdmin admin) {
+        mAdminRestrictingRemoteInput = admin;
+    }
+
     @Override
     protected void onClick() {
         final Context context = getContext();
@@ -81,9 +88,19 @@
     protected void onDialogCreated(Dialog dialog) {
         super.onDialogCreated(dialog);
         dialog.create();
-        CheckBox view = (CheckBox) dialog.findViewById(R.id.lockscreen_remote_input);
-        view.setChecked(!mAllowRemoteInput);
-        view.setOnCheckedChangeListener(mListener);
+        CheckBox checkbox = (CheckBox) dialog.findViewById(R.id.lockscreen_remote_input);
+        checkbox.setChecked(!mAllowRemoteInput);
+        checkbox.setOnCheckedChangeListener(mListener);
+        checkbox.setEnabled(mAdminRestrictingRemoteInput == null);
+
+        View restricted = dialog.findViewById(R.id.restricted_lock_icon_remote_input);
+        restricted.setVisibility(mAdminRestrictingRemoteInput == null ? View.GONE : View.VISIBLE);
+
+        if (mAdminRestrictingRemoteInput != null) {
+            checkbox.setClickable(false);
+            dialog.findViewById(com.android.internal.R.id.customPanel)
+                    .setOnClickListener(mListener);
+        }
     }
 
     @Override
@@ -122,7 +139,7 @@
     }
 
     private class Listener implements DialogInterface.OnClickListener,
-            CompoundButton.OnCheckedChangeListener {
+            CompoundButton.OnCheckedChangeListener, View.OnClickListener {
 
         private final DialogInterface.OnClickListener mInner;
         private View mView;
@@ -150,5 +167,13 @@
         public void setView(View view) {
             mView = view;
         }
+
+        @Override
+        public void onClick(View v) {
+            if (v.getId() == com.android.internal.R.id.customPanel) {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+                        mAdminRestrictingRemoteInput);
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 77a329c..97a36b6 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -23,6 +23,7 @@
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import android.app.Notification;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -33,7 +34,6 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService.Ranking;
-import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
@@ -41,6 +41,7 @@
 
 import java.util.ArrayList;
 
+import static com.android.settings.notification.RestrictedDropDownPreference.RestrictedItem;
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 abstract public class NotificationSettingsBase extends SettingsPreferenceFragment {
@@ -65,7 +66,7 @@
     protected PackageInfo mPkgInfo;
     protected ImportanceSeekBarPreference mImportance;
     protected RestrictedSwitchPreference mPriority;
-    protected DropDownPreference mVisibilityOverride;
+    protected RestrictedDropDownPreference mVisibilityOverride;
     protected RestrictedSwitchPreference mBlock;
     protected RestrictedSwitchPreference mSilent;
     protected EnforcedAdmin mSuspendedAppsAdmin;
@@ -148,6 +149,9 @@
         if (mSilent != null) {
             mSilent.setDisabledByAdmin(mSuspendedAppsAdmin);
         }
+        if (mVisibilityOverride != null) {
+            mVisibilityOverride.setDisabledByAdmin(mSuspendedAppsAdmin);
+        }
     }
 
     protected void setupImportancePrefs(boolean isSystemApp, int importance, boolean banned) {
@@ -216,13 +220,24 @@
         ArrayList<CharSequence> entries = new ArrayList<>();
         ArrayList<CharSequence> values = new ArrayList<>();
 
+        mVisibilityOverride.clearRestrictedItems();
         if (getLockscreenNotificationsEnabled() && getLockscreenAllowPrivateNotifications()) {
-            entries.add(getString(R.string.lock_screen_notifications_summary_show));
-            values.add(Integer.toString(Ranking.VISIBILITY_NO_OVERRIDE));
+            final String summaryShowEntry =
+                    getString(R.string.lock_screen_notifications_summary_show);
+            final String summaryShowEntryValue = Integer.toString(Ranking.VISIBILITY_NO_OVERRIDE);
+            entries.add(summaryShowEntry);
+            values.add(summaryShowEntryValue);
+            setRestrictedIfNotificationFeaturesDisabled(summaryShowEntry, summaryShowEntryValue,
+                    DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
+                            | DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
         }
 
-        entries.add(getString(R.string.lock_screen_notifications_summary_hide));
-        values.add(Integer.toString(Notification.VISIBILITY_PRIVATE));
+        final String summaryHideEntry = getString(R.string.lock_screen_notifications_summary_hide);
+        final String summaryHideEntryValue = Integer.toString(Notification.VISIBILITY_PRIVATE);
+        entries.add(summaryHideEntry);
+        values.add(summaryHideEntryValue);
+        setRestrictedIfNotificationFeaturesDisabled(summaryHideEntry, summaryHideEntryValue,
+                DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
         entries.add(getString(R.string.lock_screen_notifications_summary_disable));
         values.add(Integer.toString(Notification.VISIBILITY_SECRET));
         mVisibilityOverride.setEntries(entries.toArray(new CharSequence[entries.size()]));
@@ -248,6 +263,16 @@
         });
     }
 
+    private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
+            CharSequence entryValue, int keyguardNotificationFeatures) {
+        EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+                mContext, keyguardNotificationFeatures, mUserId);
+        if (admin != null) {
+            RestrictedItem item = new RestrictedItem(entry, entryValue, admin);
+            mVisibilityOverride.addRestrictedItem(item);
+        }
+    }
+
     private int getGlobalVisibility() {
         int globalVis = Ranking.VISIBILITY_NO_OVERRIDE;
         if (!getLockscreenNotificationsEnabled()) {
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 35e4036..84ae35d 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,6 +33,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.RestrictedCheckBox;
 import com.android.settings.RestrictedRadioButton;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -81,7 +83,7 @@
         private RadioGroup mRadioGroup;
         private RestrictedRadioButton mShowAllButton;
         private RestrictedRadioButton mRedactSensitiveButton;
-        private CheckBox mRemoteInputCheckbox;
+        private RestrictedCheckBox mRemoteInputCheckbox;
         private int mUserId;
 
         @Override
@@ -102,7 +104,8 @@
             mShowAllButton = (RestrictedRadioButton) view.findViewById(R.id.show_all);
             mRedactSensitiveButton =
                     (RestrictedRadioButton) view.findViewById(R.id.redact_sensitive);
-            mRemoteInputCheckbox = (CheckBox) view.findViewById(R.id.lockscreen_remote_input);
+            mRemoteInputCheckbox =
+                    (RestrictedCheckBox) view.findViewById(R.id.lockscreen_remote_input);
             mRemoteInputCheckbox.setOnCheckedChangeListener(this);
 
             mRadioGroup.setOnCheckedChangeListener(this);
@@ -129,6 +132,9 @@
                     KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
             checkNotificationFeaturesAndSetDisabled(mRedactSensitiveButton,
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+            mRemoteInputCheckbox.setDisabledByAdmin(
+                    RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(getActivity(),
+                            DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT, mUserId));
             loadFromSettings();
         }
 
diff --git a/src/com/android/settings/notification/RestrictedDropDownPreference.java b/src/com/android/settings/notification/RestrictedDropDownPreference.java
new file mode 100644
index 0000000..e4a4cb6
--- /dev/null
+++ b/src/com/android/settings/notification/RestrictedDropDownPreference.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreferenceHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RestrictedDropDownPreference extends DropDownPreference {
+    private final RestrictedPreferenceHelper mHelper;
+    private ReselectionSpinner mSpinner;
+    private List<RestrictedItem> mRestrictedItems = new ArrayList<>();
+    private boolean mUserClicked = false;
+
+    public RestrictedDropDownPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.restricted_preference_dropdown);
+        setWidgetLayoutResource(R.layout.restricted_icon);
+        mHelper = new RestrictedPreferenceHelper(context, this, attrs);
+    }
+
+    @Override
+    protected ArrayAdapter createAdapter() {
+        return new RestrictedArrayItemAdapter(getContext());
+    }
+
+    @Override
+    public void setValue(String value) {
+        if (getRestrictedItemForEntryValue(value) != null) {
+            return;
+        }
+        super.setValue(value);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        mSpinner = (ReselectionSpinner) view.itemView.findViewById(R.id.spinner);
+        mSpinner.setPreference(this);
+        super.onBindViewHolder(view);
+        mHelper.onBindViewHolder(view);
+        mSpinner.setOnItemSelectedListener(mItemSelectedListener);
+        final View restrictedIcon = view.findViewById(R.id.restricted_icon);
+        if (restrictedIcon != null) {
+            restrictedIcon.setVisibility(isDisabledByAdmin() ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private boolean isRestrictedForEntry(CharSequence entry) {
+        if (entry == null) {
+            return false;
+        }
+        for (RestrictedItem item : mRestrictedItems) {
+            if (entry.equals(item.entry)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private RestrictedItem getRestrictedItemForEntryValue(CharSequence entryValue) {
+        if (entryValue == null) {
+            return null;
+        }
+        for (RestrictedItem item : mRestrictedItems) {
+            if (entryValue.equals(item.entryValue)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    private RestrictedItem getRestrictedItemForPosition(int position) {
+        if (position < 0 || position >= getEntryValues().length) {
+            return null;
+        }
+        CharSequence entryValue = getEntryValues()[position];
+        return getRestrictedItemForEntryValue(entryValue);
+    }
+
+    public void addRestrictedItem(RestrictedItem item) {
+        mRestrictedItems.add(item);
+    }
+
+    public void clearRestrictedItems() {
+        mRestrictedItems.clear();
+    }
+
+    @Override
+    public void performClick() {
+        if (!mHelper.performClick()) {
+            mUserClicked = true;
+            super.performClick();
+        }
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (enabled && isDisabledByAdmin()) {
+            mHelper.setDisabledByAdmin(null);
+            return;
+        }
+        super.setEnabled(enabled);
+    }
+
+    public void setDisabledByAdmin(EnforcedAdmin admin) {
+        if (mHelper.setDisabledByAdmin(admin)) {
+            notifyChanged();
+        }
+    }
+
+    public boolean isDisabledByAdmin() {
+        return mHelper.isDisabledByAdmin();
+    }
+
+    private void setUserClicked(boolean userClicked) {
+        mUserClicked = userClicked;
+    }
+
+    private boolean isUserClicked() {
+        return mUserClicked;
+    }
+
+    private final OnItemSelectedListener mItemSelectedListener = new OnItemSelectedListener() {
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
+            if (mUserClicked) {
+                mUserClicked = false;
+            } else {
+                return;
+            }
+            if (position >= 0 && position < getEntryValues().length) {
+                String value = getEntryValues()[position].toString();
+                RestrictedItem item = getRestrictedItemForEntryValue(value);
+                if (item != null) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+                            item.enforcedAdmin);
+                    mSpinner.setSelection(findIndexOfValue(getValue()));
+                } else if (!value.equals(getValue()) && callChangeListener(value)) {
+                    setValue(value);
+                }
+            }
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // noop
+        }
+    };
+
+    /**
+     * Extension of {@link ArrayAdapter} which updates the state of the dropdown item
+     * depending on whether it is restricted by the admin.
+     */
+    private class RestrictedArrayItemAdapter extends ArrayAdapter<String> {
+        private static final int TEXT_RES_ID = android.R.id.text1;
+        public RestrictedArrayItemAdapter(Context context) {
+            super(context, R.layout.spinner_dropdown_restricted_item, TEXT_RES_ID);
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            View rootView = super.getView(position, convertView, parent);
+            CharSequence entry = getItem(position);
+            boolean isEntryRestricted = isRestrictedForEntry(entry);
+            TextView text = (TextView) rootView.findViewById(TEXT_RES_ID);
+            if (text != null) {
+                text.setEnabled(!isEntryRestricted);
+            }
+            View restrictedIcon = rootView.findViewById(R.id.restricted_icon);
+            if (restrictedIcon != null) {
+                restrictedIcon.setVisibility(isEntryRestricted ? View.VISIBLE : View.GONE);
+            }
+            return rootView;
+        }
+    }
+
+    /**
+     * Extension of {@link Spinner} which triggers the admin support dialog on user clicking a
+     * restricted item even if was already selected.
+     */
+    public static class ReselectionSpinner extends Spinner {
+        private RestrictedDropDownPreference pref;
+
+        public ReselectionSpinner(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public void setPreference(RestrictedDropDownPreference pref) {
+            this.pref = pref;
+        }
+
+        @Override
+        public void setSelection(int position) {
+            int previousSelectedPosition = getSelectedItemPosition();
+            super.setSelection(position);
+            if (position == previousSelectedPosition && pref.isUserClicked()) {
+                pref.setUserClicked(false);
+                RestrictedItem item = pref.getRestrictedItemForPosition(position);
+                if (item != null) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+                            item.enforcedAdmin);
+                }
+            }
+        }
+    }
+
+    public static class RestrictedItem {
+        public final CharSequence entry;
+        public final CharSequence entryValue;
+        public final EnforcedAdmin enforcedAdmin;
+
+        public RestrictedItem(CharSequence entry, CharSequence entryValue,
+                EnforcedAdmin enforcedAdmin) {
+            this.entry = entry;
+            this.entryValue = entryValue;
+            this.enforcedAdmin = enforcedAdmin;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 47f8ff9..7b13597 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -104,6 +104,8 @@
                 if (mDeleteClickListener != null
                         && !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
                                 UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
+                    deleteView.setVisibility(View.VISIBLE);
+                    deleteDividerView.setVisibility(View.VISIBLE);
                     deleteView.setOnClickListener(mDeleteClickListener);
                     deleteView.setTag(this);
                 } else {
@@ -114,11 +116,11 @@
             ImageView manageView = (ImageView) view.findViewById(R.id.manage_user);
             if (manageView != null) {
                 if (mSettingsClickListener != null) {
+                    manageView.setVisibility(View.VISIBLE);
+                    manageDividerView.setVisibility(mDeleteClickListener == null
+                            ? View.VISIBLE : View.GONE);
                     manageView.setOnClickListener(mSettingsClickListener);
                     manageView.setTag(this);
-                    if (mDeleteClickListener != null) {
-                        manageDividerView.setVisibility(View.GONE);
-                    }
                 } else {
                     manageView.setVisibility(View.GONE);
                     manageDividerView.setVisibility(View.GONE);