Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ica4c5e5051b606c79cc13de9bee71fb2348c27ac
diff --git a/Android.mk b/Android.mk
index 91a3a8f..707f557 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -26,4 +26,4 @@
 # additionally, build tests if we build via mmm / mm
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
\ No newline at end of file
+endif
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1b03ec6..bea30e4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -19,143 +19,230 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2400883737290705700">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ ছেট আপ"</string>
+    <!-- no translation found for app_label (2400883737290705700) -->
+    <skip />
     <string name="provisioning_error_title" msgid="6320515739861578118">"ওঁহ!"</string>
-    <string name="setup_work_profile" msgid="1468934631731845267">"কৰ্মস্থানৰ প্ৰ’ফাইল ছেট আপ কৰক"</string>
+    <!-- no translation found for setup_work_profile (1468934631731845267) -->
+    <skip />
     <string name="company_controls_workspace" msgid="2808025277267917221">"আপোনাৰ সংস্থাই এই প্ৰ\'ফাইলটো নিয়ন্ত্ৰণ কৰে আৰু সুৰক্ষিত কৰি ৰাখে। আপুনি আপোনাৰ ডিভাইচত ইয়াৰ বাহিৰে অন্যবিলাক নিয়ন্ত্ৰণ কৰিব পাৰে।"</string>
-    <string name="company_controls_device" msgid="8230957518758871390">"আপোনাৰ সংস্থাই এই ডিভাইচটো নিয়ন্ত্ৰণ কৰিব আৰু সুৰক্ষিত কৰি ৰাখিব।"</string>
+    <!-- no translation found for company_controls_device (8230957518758871390) -->
+    <skip />
     <string name="the_following_is_your_mdm" msgid="6613658218262376404">"নিম্নোক্ত এপটোৱে এই প্ৰ\'ফাইলটোলৈ যোৱাৰ প্ৰয়োজন:"</string>
-    <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"এই এপটোৱে আপোনাৰ ডিভাইচটো পৰিচালনা কৰিব:"</string>
-    <string name="next" msgid="1004321437324424398">"পৰৱৰ্তী"</string>
-    <string name="setting_up_workspace" msgid="7862472373642601041">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল ছেট আপ কৰি থকা হৈছে…"</string>
-    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"আপোনাৰ প্ৰশাসকে এই প্ৰ\'ফাইলৰ লগত জড়িত ছেটিংসমূহ, কৰ্প\'ৰেইট আৰু এপসমূহৰ অনুমতি আৰু ডেটাৰ লগতে নেটৱৰ্কৰ কাৰ্যকলাপ, আপোনাৰ ডিভাইচৰ অৱস্থান, কলৰ ইতিহাস আৰু সম্পৰ্ক সূচীত থকা ব্যক্তিসকলক সন্ধান কৰা ইতিহাস পৰ্যবেক্ষণ আৰু পৰিচালনা কৰিব পাৰিব।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>অধিক তথ্যৰ লগতে আপোনাৰ প্ৰতিষ্ঠানৰ গোপনীয়তাৰ নীতিসমূহৰ বিষয়ে জানিবলৈ আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"আপোনাৰ প্ৰশাসকে ছেটিংসমূহ, ক’ৰ্পৰেট প্ৰৱেশাধিকাৰ, এপসমূহ, অনুমতিসমূহ আৰু ডিভাইচটোৰ লগত জড়িত অন্যান্য ডেটা পৰ্যবেক্ষণ কৰাৰ লগতে পৰিচালনা কৰিবলৈ সক্ষম। সেই ডেটাবিলাকৰ ভিতৰত নেটৱৰ্কৰ কাৰ্যকলাপ, ডিভাইচৰ অৱস্থানৰ তথ্য, কলৰ ইতিহাস আৰু সম্পৰ্কসূচীত আপুনি কৰা অনুসন্ধানৰ ইতিহাস আদিও অন্তৰ্ভুক্ত।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>অধিক তথ্যৰ বাবে আৰু লগতে আপোনাৰ প্ৰতিষ্ঠানৰ গোপনীয়তাৰ নীতিসমূহৰ বিষয়ে জানিবলৈ আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"চুৰি প্ৰতিৰোধী সুৰক্ষা সুবিধা ব্যৱহাৰ কৰিবৰ বাবে আপোনাৰ ডিভাইচত পাছৱৰ্ডেৰে সুৰক্ষিত স্ক্ৰীণ ল\'ক থাকিব লাগিব।"</string>
-    <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"আপোনাৰ প্ৰতিষ্ঠানৰ গোপনীয়তা নীতিসমূহকে ধৰি অধিক তথ্য়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
+    <!-- no translation found for the_following_is_your_mdm_for_device (6717973404364414816) -->
+    <skip />
+    <!-- no translation found for next (1004321437324424398) -->
+    <skip />
+    <!-- no translation found for setting_up_workspace (7862472373642601041) -->
+    <skip />
+    <!-- no translation found for admin_has_ability_to_monitor_profile (4552308842716093826) -->
+    <skip />
+    <!-- no translation found for admin_has_ability_to_monitor_device (8598573866079474861) -->
+    <skip />
+    <!-- no translation found for theft_protection_disabled_warning (3708092473574738478) -->
+    <skip />
+    <!-- no translation found for contact_your_admin_for_more_info (5959191345827902911) -->
+    <skip />
     <string name="learn_more_link" msgid="3012495805919550043">"অধিক জানক"</string>
     <string name="cancel_setup" msgid="2949928239276274745">"বাতিল কৰক"</string>
-    <string name="ok_setup" msgid="4593707675416137504">"ঠিক আছে"</string>
-    <string name="user_consent_msg" msgid="8820951802130353584">"মই সন্মতি দিছোঁ"</string>
+    <!-- no translation found for ok_setup (4593707675416137504) -->
+    <skip />
+    <!-- no translation found for user_consent_msg (8820951802130353584) -->
+    <skip />
     <string name="url_error" msgid="5958494012986243186">"এই লিংকটো দেখুওৱাব পৰা নাযায়।"</string>
-    <string name="terms" msgid="8295436105384703903">"চৰ্তসমূহ"</string>
-    <string name="work_profile_info" msgid="5433388376309583996">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ বিষয়ে তথ্য"</string>
+    <!-- no translation found for terms (8295436105384703903) -->
+    <skip />
+    <!-- no translation found for work_profile_info (5433388376309583996) -->
+    <skip />
     <string name="managed_device_info" msgid="1529447646526616811">"পৰিচালিত ডিভাইচৰ তথ্য"</string>
     <string name="default_managed_profile_name" msgid="5370257687074907055">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
-    <string name="default_first_meat_user_name" msgid="7540515892748490540">"মুখ্য ব্যৱহাৰকাৰী"</string>
+    <!-- no translation found for default_first_meat_user_name (7540515892748490540) -->
+    <skip />
     <string name="delete_profile_title" msgid="2841349358380849525">"আগৰে পৰা থকা প্ৰ\'ফাইলটো মচিবনে?"</string>
-    <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"আপোনাৰ ইতিমধ্যে এটা কৰ্মস্থানৰ প্ৰ\'ফাইল আছে। সেইটোক তলত উল্লেখ কৰা এপটোৱে পৰিচালনা কৰে:"</string>
-    <string name="read_more_delete_profile" msgid="7789171620401666343">"আৰম্ভ কৰাৰ আগতে, "<a href="#read_this_link">"এয়া পঢ়ক"</a>"।"</string>
-    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"আপুনি এই কার্য অব্য়াহত ৰাখিলে এই প্ৰ\'ফাইলৰ সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
+    <!-- no translation found for opening_paragraph_delete_profile (4913885310795775967) -->
+    <skip />
+    <!-- no translation found for read_more_delete_profile (7789171620401666343) -->
+    <skip />
+    <!-- no translation found for sure_you_want_to_delete_profile (6927697984573575564) -->
+    <skip />
     <string name="delete_profile" msgid="2299218578684663459">"মচক"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"বাতিল কৰক"</string>
-    <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলটো ছেট আপ কৰিবলৈ আপোনাৰ ডিভাইচটো এনক্ৰিপ্ট কৰিব লাগিব। এই কাম সম্পূৰ্ণ হ\'বলৈ কিছু সময়ৰ প্ৰয়োজন হ\'ব পাৰে।"</string>
-    <string name="encrypt_device_text_for_device_owner_setup" msgid="5194673142404735676">"এই ডিভাইচটো ছেট আপ কৰিবলৈ ইয়াক প্ৰথমে এনক্ৰিপ্ট কৰিব লাগিব। এই কাম সম্পূৰ্ণ হ\'বলৈ কিছু সময়ৰ প্ৰয়োজন হ\'ব পাৰে।"</string>
-    <string name="encrypt_this_device_question" msgid="8719916619866892601">"এই ডিভাইচটো এনক্ৰিপ্ট কৰিবনে?"</string>
-    <string name="encrypt" msgid="1749320161747489212">"এনক্ৰিপ্ট কৰক"</string>
+    <!-- no translation found for encrypt_device_text_for_profile_owner_setup (7828515754696057140) -->
+    <skip />
+    <!-- no translation found for encrypt_device_text_for_device_owner_setup (5194673142404735676) -->
+    <skip />
+    <!-- no translation found for encrypt_this_device_question (8719916619866892601) -->
+    <skip />
+    <!-- no translation found for encrypt (1749320161747489212) -->
+    <skip />
     <string name="continue_provisioning_notify_title" msgid="5191449100153186648">"এনক্ৰিপশ্বন সম্পূৰ্ণ হ\'ল"</string>
-    <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ ছেটিং কাৰ্য অব্যাহত ৰাখিবলৈ ইয়াত টিপক"</string>
+    <!-- no translation found for continue_provisioning_notify_text (1066841819786425980) -->
+    <skip />
     <string name="managed_provisioning_error_text" msgid="7063621174570680890">"কৰ্মস্থানৰ প্ৰ\'ফাইল ছেটআপ কৰিব পৰা নগ\'ল। আপোনাৰ আইটি বিভাগৰ সৈতে যোগাযোগ কৰক বা পিছত পুনৰ চেষ্টা কৰক।"</string>
-    <string name="cant_add_work_profile" msgid="9217268909964154934">"কৰ্মস্থানৰ প্ৰ\'ফাইল যোগ কৰিব নোৱাৰি"</string>
-    <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"কৰ্মস্থানৰ প্ৰ\'ফাইল আঁতৰাব বা সলনি কৰিব নোৱাৰি"</string>
-    <string name="work_profile_cant_be_added_contact_admin" msgid="4740182491195894659">"এই ডিভাইচটোত কোনো কৰ্মস্থানৰ প্ৰ\'ফাইল যোগ কৰিব নোৱাৰি। আপোনাৰ কিবা প্ৰশ্ন থাকিলে, আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="change_device_launcher" msgid="4523563368433637980">"ডিভাইচ লঞ্চাৰ সলনি কৰক"</string>
+    <!-- no translation found for cant_add_work_profile (9217268909964154934) -->
+    <skip />
+    <!-- no translation found for cant_replace_or_remove_work_profile (7861054306792698290) -->
+    <skip />
+    <!-- no translation found for work_profile_cant_be_added_contact_admin (4740182491195894659) -->
+    <skip />
+    <!-- no translation found for change_device_launcher (4523563368433637980) -->
+    <skip />
     <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলে এই লঞ্চাৰ এপটো ব্যৱহাৰ কৰিব নোৱাৰে"</string>
     <string name="cancel_provisioning" msgid="3408069559452653724">"বাতিল কৰক"</string>
     <string name="pick_launcher" msgid="4257084827403983845">"ঠিক আছে"</string>
-    <string name="user_setup_incomplete" msgid="6494920045526591079">"ব্যৱহাৰকাৰীৰ ছেট আপ কার্য সম্পূর্ণ নহ\'ল"</string>
+    <!-- no translation found for user_setup_incomplete (6494920045526591079) -->
+    <skip />
     <string name="default_owned_device_username" msgid="3915120202811807955">"কৰ্মস্থানৰ ডিভাইচৰ ব্যৱহাৰকাৰী"</string>
-    <string name="setup_work_device" msgid="6003988351437862369">"কৰ্মস্থানৰ ডিভাইচ ছেট আপ কৰি থকা হৈছে…"</string>
-    <string name="progress_data_process" msgid="1707745321954672971">"ডেটা ছেট আপ প্ৰক্ৰিয়া চলি আছে…"</string>
-    <string name="progress_connect_to_wifi" msgid="472251154628863539">"ৱাই-ফাইৰ লগত সংযোগ কৰি থকা হৈছে…"</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"ম\'বাইল নেটৱৰ্কৰ সৈতে সংযোগ কৰি থকা হৈছে…"</string>
-    <string name="progress_download" msgid="3522436271691064624">"প্ৰশাসক এপ্ ডাউনল\'ড কৰি থকা হৈছে…"</string>
-    <string name="progress_install" msgid="2258045670385866183">"প্ৰশাসক এপ্ ইনষ্টল কৰি থকা হৈছে…"</string>
-    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"অপ্ৰয়োজনীয় ছিষ্টেম এপসমূহ আঁতৰাই থকা হৈছে…"</string>
-    <string name="progress_finishing_touches" msgid="9037776404089697198">"অন্তিম পৰ্যায়ৰ কামবোৰ কৰি থকা হৈছে…"</string>
-    <string name="progress_set_owner" msgid="8214062820093757961">"ডিভাইচৰ গৰাকী ছেট আপ কৰি থকা হৈছে…"</string>
-    <string name="progress_initialize" msgid="1104643492713424939">"ডিভাইচটো আৰম্ভ কৰি থকা হৈছে…"</string>
-    <string name="device_doesnt_allow_encryption_contact_admin" msgid="8297141458771829628">"এই ডিভাইচটোৱে ছেট আপৰ বাবে দৰকাৰী এনক্ৰিপশ্বন কৰিবলৈ নিদিয়ে। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
+    <!-- no translation found for setup_work_device (6003988351437862369) -->
+    <skip />
+    <!-- no translation found for progress_data_process (1707745321954672971) -->
+    <skip />
+    <!-- no translation found for progress_connect_to_wifi (472251154628863539) -->
+    <skip />
+    <!-- no translation found for progress_download (3522436271691064624) -->
+    <skip />
+    <!-- no translation found for progress_install (2258045670385866183) -->
+    <skip />
+    <!-- no translation found for progress_delete_non_required_apps (7633458399262691256) -->
+    <skip />
+    <!-- no translation found for progress_finishing_touches (9037776404089697198) -->
+    <skip />
+    <!-- no translation found for progress_set_owner (8214062820093757961) -->
+    <skip />
+    <!-- no translation found for progress_initialize (1104643492713424939) -->
+    <skip />
+    <!-- no translation found for device_doesnt_allow_encryption_contact_admin (8297141458771829628) -->
+    <skip />
     <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"ছেট আপ বন্ধ কৰি ডিভাইচটো ৰিছেট কৰিবনে?"</string>
-    <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"এই কাৰ্যই আপোনাৰ ডিভাইচটো ৰিছেট কৰিব আৰু আপোনাক আৰম্ভণিৰ স্ক্ৰীণখনলৈ লৈ যাব"</string>
-    <string name="device_owner_cancel_message" msgid="2529288571742712065">"ছেট আপ কার্য বন্ধ কৰেনে আৰু আপোনাৰ ডিভাইচটোৰ ডেটা মচেনে?"</string>
+    <!-- no translation found for this_will_reset_take_back_first_screen (4623290347188404725) -->
+    <skip />
+    <!-- no translation found for device_owner_cancel_message (2529288571742712065) -->
+    <skip />
     <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"বাতিল কৰক"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"ঠিক আছে"</string>
-    <string name="reset" msgid="6467204151306265796">"ৰিছেট কৰক"</string>
+    <!-- no translation found for reset (6467204151306265796) -->
+    <skip />
     <string name="cant_set_up_profile" msgid="4341825293970158436">"প্ৰ\'ফাইল ছেট আপ কৰিব নোৱাৰি"</string>
     <string name="cant_set_up_device" msgid="4120090138983350714">"ডিভাইচ ছেট আপ কৰিব নোৱাৰি"</string>
-    <string name="couldnt_set_up_device" msgid="60699158233724802">"ডিভাইচ ছেট আপ কৰিব পৰা নগ\'ল। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
+    <!-- no translation found for couldnt_set_up_device (60699158233724802) -->
+    <skip />
     <string name="contact_your_admin_for_help" msgid="8045606258802719235">"সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"ডিভাইচটো ইতিমধ্যে ছেট আপ কৰি ৰখা হৈছে"</string>
     <string name="device_owner_error_wifi" msgid="4256310285761332378">"ৱাই-ফাইৰ লগত সংযোগ কৰিব পৰা নগ\'ল"</string>
-    <string name="device_has_reset_protection_contact_admin" msgid="1221351721899290155">"আপোনাৰ ডিভাইচটোত ৰিছেট সুৰক্ষা সুবিধা অন হৈ আছে। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="frp_clear_progress_title" msgid="8628074089458234965">"মচি থকা হৈছে"</string>
-    <string name="frp_clear_progress_text" msgid="1740164332830598827">"অনুগ্রহ কৰি অপেক্ষা কৰক..."</string>
-    <string name="device_owner_error_hash_mismatch" msgid="7256273143549784838">"চ্চেকছাম আসোঁৱাহৰ বাবে প্ৰশাসক এপটো ব্যৱহাৰ কৰিব পৰা নগ\'ল। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
+    <!-- no translation found for device_has_reset_protection_contact_admin (1221351721899290155) -->
+    <skip />
+    <!-- no translation found for frp_clear_progress_title (8628074089458234965) -->
+    <skip />
+    <!-- no translation found for frp_clear_progress_text (1740164332830598827) -->
+    <skip />
+    <!-- no translation found for device_owner_error_hash_mismatch (7256273143549784838) -->
+    <skip />
     <string name="device_owner_error_download_failed" msgid="4520111971592657116">"এডমিন এপটো ডাউনল\'ড কৰিব পৰা নগ\'ল"</string>
-    <string name="device_owner_error_package_invalid" msgid="1096901016820157695">"প্ৰশাসক এপটো ব্যৱহাৰ কৰিব নোৱাৰি। এপটোত থাকিবলগীয়া কোনো উপাদান নাই বা ই ব্যৱহাৰযোগ্য হৈ থকা নাই। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
+    <!-- no translation found for device_owner_error_package_invalid (1096901016820157695) -->
+    <skip />
     <string name="device_owner_error_installation_failed" msgid="684566845601079360">"এডমিন এপটো ইনষ্টল কৰিব পৰা নগ\'ল"</string>
-    <string name="profile_owner_cancel_message" msgid="6868736915633023477">"ছেট আপ কার্য বন্ধ কৰিবনে?"</string>
+    <!-- no translation found for profile_owner_cancel_message (6868736915633023477) -->
+    <skip />
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"নহয়"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"হয়"</string>
-    <string name="profile_owner_cancelling" msgid="5679573829145112822">"বাতিল কৰি থকা হৈছে…"</string>
-    <string name="work_profile_setup_later_title" msgid="9069148190226279892">"প্ৰ\'ফাইল ছেট আপ কার্য বন্ধ কৰিবনে?"</string>
-    <string name="work_profile_setup_later_message" msgid="122069011117225292">"আপুনি পিছত আপোনাৰ প্ৰতিষ্ঠানৰ ডিভাইচ পৰিচালনা এপত আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল ছেট আপ কৰিব পাৰিব"</string>
+    <!-- no translation found for profile_owner_cancelling (5679573829145112822) -->
+    <skip />
+    <!-- no translation found for work_profile_setup_later_title (9069148190226279892) -->
+    <skip />
+    <!-- no translation found for work_profile_setup_later_message (122069011117225292) -->
+    <skip />
     <string name="continue_button" msgid="7177918589510964446">"অব্যাহত ৰাখক"</string>
-    <string name="work_profile_setup_stop" msgid="6772128629992514750">"বন্ধ কৰক"</string>
-    <string name="dismiss" msgid="9009534756748565880">"অগ্ৰাহ্য কৰক"</string>
-    <string name="profile_owner_info" msgid="8975319972303812298">"আপুনি এটা কৰ্মস্থানৰ প্ৰ\'ফাইল সৃষ্টি কৰিবলৈ লৈছে যাক আপোনাৰ প্ৰতিষ্ঠানে পৰিচালনা কৰাৰ লগতে পৰ্যবেক্ষণও কৰিব। চৰ্ত প্ৰযোজ্য হ\'ব।"</string>
+    <!-- no translation found for work_profile_setup_stop (6772128629992514750) -->
+    <skip />
+    <!-- no translation found for dismiss (9009534756748565880) -->
+    <skip />
+    <!-- no translation found for profile_owner_info (8975319972303812298) -->
+    <skip />
     <string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"আপুনি এটা কৰ্মস্থানৰ প্ৰ\'ফাইল সৃষ্টি কৰিবলৈ লৈছে যাক আপোনাৰ প্ৰতিষ্ঠানে পৰিচালনা কৰাৰ লগতে পৰ্যবেক্ষণও কৰিব। <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>ৰ চৰ্ত প্ৰযোজ্য হ\'ব।"</string>
-    <string name="profile_owner_info_comp" msgid="9190421701126119142">"আপোনাৰ কৰ্মস্থান সম্পৰ্কীয় এপসমূহৰ বাবে এটা প্ৰ\'ফাইল সৃষ্টি কৰা হ\'ব। আপোনাৰ প্ৰতিষ্ঠানে এই প্ৰ\'ফাইলটো আৰু বাকী ডিভাইচটো পৰিচালনা কৰাৰ লগতে পৰ্যবেক্ষণও কৰিব। চৰ্ত প্ৰযোজ্য হ\'ব।"</string>
+    <!-- no translation found for profile_owner_info_comp (9190421701126119142) -->
+    <skip />
     <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"আপোনাৰ কৰ্মস্থান সম্পৰ্কীয় এপসমূহৰ বাবে এটা প্ৰ\'ফাইল সৃষ্টি কৰা হ\'ব। আপোনাৰ প্ৰতিষ্ঠানে এই প্ৰ\'ফাইল আৰু বাকী ডিভাইচৰ প্ৰ\'ফাইল পৰিচালনা কৰাৰ লগতে পৰ্যবেক্ষণও কৰিব। <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>ৰ চৰ্ত প্ৰযোজ্য হ\'ব।"</string>
-    <string name="device_owner_info" msgid="3716661456037934467">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>এ এই ডিভাইচটো পৰিচালনা কৰিব, পৰ্যবেক্ষণ কৰিব আৰু সুৰক্ষিত কৰি ৰাখিব। চৰ্ত প্ৰযোজ্য হ\'ব। <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
-    <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>এ এই ডিভাইচটো পৰিচালনা কৰিব, পৰ্যবেক্ষণ কৰিব আৰু সুৰক্ষিত কৰি ৰাখিব। <xliff:g id="TERMS_HEADERS">%2$s</xliff:g>ৰ চৰ্তাৱলী প্ৰযোজ্য হ\'ব। <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
-    <string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"এই লিংকটো সুৰক্ষিত নহয় আৰু ইয়াক ডিভাইচটোৰ ছেট আপ সম্পূৰ্ণ নোহোৱালৈকে খুলিব পৰা নাযাব: <xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>"</string>
-    <string name="contact_device_provider" msgid="9100405424740726066">"আপোনাৰ কিবা প্ৰশ্ন থাকিলে <xliff:g id="ORGANIZATIONS_ADMIN">%1$s</xliff:g>ৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="if_questions_contact_admin" msgid="6147462485780267795">"আপোনাৰ কিবা প্ৰশ্ন থাকিলে, আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="setup_isnt_finished_contact_admin" msgid="235011880559615998">"ছেট আপ সম্পূৰ্ণ হোৱা নাই। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="for_help_contact_admin" msgid="8687037236275184653">"সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক"</string>
-    <string name="organization_admin" msgid="1595001081906025683">"প্ৰতিষ্ঠানৰ প্ৰশাসক"</string>
-    <string name="your_org_app_used" msgid="5336414768293540831">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>এ এই ডিভাইচটো তলত উল্লেখ কৰা এপটো ব্যৱহাৰ কৰি পৰিচালনা আৰু পৰ্যবেক্ষণ কৰিব:"</string>
+    <!-- no translation found for device_owner_info (2883639372446424007) -->
+    <skip />
+    <!-- no translation found for device_owner_info_with_terms_headers (7333703548160002079) -->
+    <skip />
+    <!-- no translation found for link_isnt_secure_and_cant_be_opened_until_device_setup_finished (1604497932637832657) -->
+    <skip />
+    <!-- no translation found for contact_device_provider (9100405424740726066) -->
+    <skip />
+    <!-- no translation found for if_questions_contact_admin (6147462485780267795) -->
+    <skip />
+    <!-- no translation found for setup_isnt_finished_contact_admin (235011880559615998) -->
+    <skip />
+    <!-- no translation found for for_help_contact_admin (8687037236275184653) -->
+    <skip />
+    <!-- no translation found for organization_admin (1595001081906025683) -->
+    <skip />
+    <!-- no translation found for your_org_app_used (5336414768293540831) -->
+    <skip />
     <string name="your_organization_beginning" msgid="5952561489910967255">"আপোনাৰ প্ৰতিষ্ঠান"</string>
     <string name="your_organization_middle" msgid="8288538158061644733">"আপোনাৰ প্ৰতিষ্ঠান"</string>
-    <string name="view_terms" msgid="7230493092383341605">"চৰ্তসমূহ চাওক"</string>
+    <!-- no translation found for view_terms (7230493092383341605) -->
+    <skip />
     <string name="accept_and_continue" msgid="1632679734918410653">"গ্ৰহণ কৰি অব্যাহত ৰাখক"</string>
-    <string name="close" msgid="7208600934846389439">"বন্ধ কৰক"</string>
-    <string name="set_up_your_device" msgid="1896651520959894681">"আপোনাৰ ডিভাইচটো ছেট আপ কৰক"</string>
-    <string name="info_anim_title_0" msgid="3285414600215959704">"আপুনি কেনেকৈ কাম কৰে তাক সলনি কৰক"</string>
-    <string name="info_anim_title_1" msgid="2657512519467714760">"আপোনাৰ কর্ম আৰু ব্যক্তিগত জীৱন সুকীয়া কৰি ৰাখক"</string>
+    <!-- no translation found for close (7208600934846389439) -->
+    <skip />
+    <!-- no translation found for set_up_your_device (1896651520959894681) -->
+    <skip />
+    <!-- no translation found for info_anim_title_0 (3285414600215959704) -->
+    <skip />
+    <!-- no translation found for info_anim_title_1 (2657512519467714760) -->
+    <skip />
     <string name="one_place_for_work_apps" msgid="2595597562302953960">"কৰ্মস্থানৰ এপবোৰৰ বাবে একেখন ঠাই"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"আপোনাৰ কাম সম্পন্ন হ\'লে অফ কৰক"</string>
-    <string name="provisioning" msgid="4512493827019163451">"প্ৰ\'ভিজনিং"</string>
-    <string name="copying_certs" msgid="5697938664953550881">"চিএ প্ৰমাণপত্ৰসমূহ ছেট আপ কৰি থকা হৈছে"</string>
+    <!-- no translation found for provisioning (4512493827019163451) -->
+    <skip />
+    <!-- no translation found for copying_certs (5697938664953550881) -->
+    <skip />
     <string name="setup_profile" msgid="5573950582159698549">"আপোনাৰ প্ৰ\'ফাইল ছেট আপ কৰক"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"কৰ্মস্থানৰ প্ৰ\'ফাইল ব্যৱহাৰ কৰি আপুনি কৰ্মস্থান সম্পৰ্কীয় ডেটা আৰু ব্যক্তিগত ডেটাক সুকীয়াকৈ ৰাখিব পাৰে"</string>
     <string name="comp_profile_benefits_description" msgid="379837075456998273">"কৰ্মস্থানৰ প্ৰ\'ফাইল ব্যৱহাৰ কৰি আপুনি কৰ্মস্থান সম্পৰ্কীয় এপবোৰক একেঠাইতে ৰাখিব পাৰে"</string>
-    <string name="setup_profile_encryption" msgid="5241291404536277038">"আপোনাৰ ডিভাইচৰ ছেট আপ প্ৰক্ৰিয়া। এনক্ৰিপশ্বন"</string>
-    <string name="setup_profile_progress" msgid="7742718527853325656">"আপোনাৰ প্ৰ\'ফাইলৰ ছেট আপ প্ৰক্ৰিয়া। অগ্ৰগতি দেখুওৱা হৈছে"</string>
+    <!-- no translation found for setup_profile_encryption (5241291404536277038) -->
+    <skip />
+    <!-- no translation found for setup_profile_progress (7742718527853325656) -->
+    <skip />
     <string name="setup_device" msgid="6725265673245816366">"আপোনাৰ ডিভাইচ ছেটআপ কৰক"</string>
-    <string name="setup_device_encryption" msgid="7852944465414197103">"আপোনাৰ ডিভাইচৰ ছেট আপ প্ৰক্ৰিয়া। এনক্ৰিপশ্বন"</string>
-    <string name="setup_device_progress" msgid="7035335208571175393">"আপোনাৰ ডিভাইচৰ ছেট আপ প্ৰক্ৰিয়া। অগ্ৰগতি দেখুওৱা হৈছে"</string>
-    <string name="learn_more_label" msgid="2723716758654655009">"অধিক জানক বুটাম"</string>
-    <string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g> আইকন"</string>
+    <!-- no translation found for setup_device_encryption (7852944465414197103) -->
+    <skip />
+    <!-- no translation found for setup_device_progress (7035335208571175393) -->
+    <skip />
+    <!-- no translation found for learn_more_label (2723716758654655009) -->
+    <skip />
+    <!-- no translation found for mdm_icon_label (3399134595549660561) -->
+    <skip />
     <string name="section_heading" msgid="3924666803774291908">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> খণ্ডৰ শিৰোনাম।"</string>
     <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> খণ্ডৰ সমল: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
     <string name="expand" msgid="37188292156131304">"বিস্তাৰ কৰক"</string>
     <string name="collapse" msgid="7817530505064432580">"সংকুচিত কৰক"</string>
-    <string name="access_list_of_links" msgid="7094123315959323372">"লিংকৰ তালিকা এখন পাওক"</string>
+    <!-- no translation found for access_list_of_links (7094123315959323372) -->
+    <skip />
     <string name="access_links" msgid="7991363727326168600">"মেনু খোলাৰ লিংকবোৰ"</string>
     <string name="access_terms" msgid="1982500872249763745">"স্ক্ৰিণ খোলাৰ শব্দ…"</string>
-    <string name="read_terms" msgid="1745011123626640728">"চৰ্তসমূহ পঢ়ক"</string>
-    <string name="close_list" msgid="9053538299788717597">"তালিকা বন্ধ কৰক"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"ছেট আপ আৰু ফেক্টৰী ৰিছেট কার্য বন্ধ কৰিবনে?"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"ছেট আপ কার্য বন্ধ কৰিলে আপোনাৰ ডিভাইচটো ফেক্টৰী ৰিছেট কৰা হ\'ব আৰু আপোনাক আৰম্ভণিৰ স্ক্ৰীণলৈ লৈ যোৱা হ\'ব।"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"বাতিল কৰক"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"ডিভাইচটো ৰিছেট কৰক"</string>
+    <!-- no translation found for read_terms (1745011123626640728) -->
+    <skip />
+    <!-- no translation found for close_list (9053538299788717597) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_title (5416045931532004811) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_msg (808442439937994485) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_cancel (2810966091829264727) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_ok (7168008267496150529) -->
+    <skip />
     <string name="join_two_items" msgid="6110273439759895837">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> আৰু <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
-    <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>, আৰু <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
+    <!-- no translation found for join_many_items_last (7469666990442158802) -->
+    <skip />
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="take_a_few_minutes" msgid="6282806501305322838">"এই কামত কেইবামিনিটও সময় লাগিব পাৰে"</string>
-    <string name="work_profile_description" msgid="8524116010729569213">"আপোনাৰ কৰ্মস্থানৰ এপসমূহ এই প্ৰ\'ফাইলত ৰখা হ\'ব আপোনাৰ প্ৰতিষ্ঠানে ইয়াক পৰিচালনা কৰিব"</string>
-    <string name="device_owner_description" msgid="168013145812679664">"আপোনাৰ প্ৰতিষ্ঠানে এই ডিভাইচটো পৰিচালনা কৰিব আৰু সুৰক্ষিত কৰি ৰাখিব।"</string>
+    <!-- no translation found for take_a_few_minutes (6282806501305322838) -->
+    <skip />
+    <!-- no translation found for work_profile_description (8524116010729569213) -->
+    <skip />
+    <!-- no translation found for device_owner_description (168013145812679664) -->
+    <skip />
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3ab11f7..891a74f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -28,8 +28,8 @@
     <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"নিম্নলিখিত অ্যাপ্লিকেশানটি আপনার ডিভাইস পরিচালনা করবে:"</string>
     <string name="next" msgid="1004321437324424398">"পরবর্তী"</string>
     <string name="setting_up_workspace" msgid="7862472373642601041">"কর্মস্থলের প্রোফাইল সেট-আপ করা হচ্ছে…"</string>
-    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"আপনার প্রশাসক আপনার প্রোফাইলের সেটিংস, কর্পোরেট অ্যাক্সেস, অ্যাপ, অনুমতি, এবং নেটওয়ার্ক কার্যকলাপ সহ আপনার প্রোফাইলের সাথে সম্পর্কিত ডেটা, এবং আপনার ডিভাইসের লোকেশন, এবং কল ও পরিচিতি অনুসন্ধানের ইতিহাসের উপরে নজর রাখতে ও সেগুলি পরিচালনা করতে পারেন।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>আপনার প্রতিষ্ঠানের গোপনীয়তা নীতি সহ আরও তথ্যের জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
-    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"আপনার প্রশাসক আপনার ডিভাইসের সেটিংস, কর্পোরেট অ্যাক্সেস, অ্যাপ, অনুমতি, এবং নেটওয়ার্ক কার্যকলাপ সহ ডিভাইসের সাথে সম্পর্কিত ডেটা, ডিভাইসের লোকেশন, এবং কল ও পরিচিতি অনুসন্ধানের ইতিহাসের উপরে নজর রাখতে ও সেগুলি পরিচালনা করতে পারেন।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>আপনার প্রতিষ্ঠানের গোপনীয়তা নীতি সহ আরও তথ্যের জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
+    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"আপনার প্রশাসক আপনার প্রোফাইলের সেটিংস, কর্পোরেট অ্যাক্সেস, অ্যাপ, অনুমতি, এবং নেটওয়ার্ক অ্যাক্টিভিটি সহ আপনার প্রোফাইলের সাথে সম্পর্কিত ডেটা, এবং আপনার ডিভাইসের লোকেশন, এবং কল ও পরিচিতি সার্চের ইতিহাসের উপরে নজর রাখতে ও সেগুলি পরিচালনা করতে পারেন।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>আপনার প্রতিষ্ঠানের গোপনীয়তা নীতি সহ আরও তথ্যের জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
+    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"আপনার প্রশাসক আপনার ডিভাইসের সেটিংস, কর্পোরেট অ্যাক্সেস, অ্যাপ, অনুমতি, এবং নেটওয়ার্ক অ্যাক্টিভিটি সহ ডিভাইসের সাথে সম্পর্কিত ডেটা, ডিভাইসের লোকেশন, এবং কল ও পরিচিতি সার্চের ইতিহাসের উপরে নজর রাখতে ও সেগুলি পরিচালনা করতে পারেন।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>আপনার প্রতিষ্ঠানের গোপনীয়তা নীতি সহ আরও তথ্যের জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"চুরির-সুরক্ষা বৈশিষ্ট্যগুলি ব্যবহার করতে আপনার ডিভাইসে অবশ্যই একটি পাসওয়ার্ড দ্বারা সুরক্ষিত স্ক্রিন লক ব্যবস্থাটিকে সক্ষম রাখতে হবে৷"</string>
     <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"আপনার প্রতিষ্ঠানের গোপনীয়তা নীতিগুলি সহ আরও তথ্যের জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="learn_more_link" msgid="3012495805919550043">"আরও জানুন"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c81e1f7..e515f64 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -54,7 +54,7 @@
     <string name="encrypt" msgid="1749320161747489212">"Verschlüsseln"</string>
     <string name="continue_provisioning_notify_title" msgid="5191449100153186648">"Verschlüsselung abgeschlossen"</string>
     <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"Tippe, um die Einrichtung des Arbeitsprofils fortzusetzen"</string>
-    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Dein Arbeitsprofil konnte nicht eingerichtet werden. Bitte wende dich an deine IT-Abteilung oder versuche es später erneut."</string>
+    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Dein Arbeitsprofil konnte nicht eingerichtet werden. Bitte wende dich an deine IT-Abteilung oder versuche es später noch einmal."</string>
     <string name="cant_add_work_profile" msgid="9217268909964154934">"Arbeitsprofil kann nicht hinzugefügt werden"</string>
     <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"Arbeitsprofil kann nicht ersetzt oder entfernt werden"</string>
     <string name="work_profile_cant_be_added_contact_admin" msgid="4740182491195894659">"Diesem Gerät kann kein Arbeitsprofil hinzugefügt werden. Wende dich bei Fragen an deinen Administrator."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 914d9ca..4e0eff8 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -67,7 +67,6 @@
     <string name="setup_work_device" msgid="6003988351437862369">"Setting up work device…"</string>
     <string name="progress_data_process" msgid="1707745321954672971">"Processing setup data…"</string>
     <string name="progress_connect_to_wifi" msgid="472251154628863539">"Connecting to Wi-Fi…"</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"Connecting to mobile network…"</string>
     <string name="progress_download" msgid="3522436271691064624">"Downloading the admin app…"</string>
     <string name="progress_install" msgid="2258045670385866183">"Installing the admin app…"</string>
     <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"Removing non-required system apps…"</string>
@@ -107,8 +106,8 @@
     <string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"You\'re about to create a work profile that will be managed and monitored by your organisation. Terms from <xliff:g id="TERMS_HEADERS">%1$s</xliff:g> will apply."</string>
     <string name="profile_owner_info_comp" msgid="9190421701126119142">"A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organisation. Terms will apply."</string>
     <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organisation. Terms from <xliff:g id="TERMS_HEADERS">%1$s</xliff:g> will apply."</string>
-    <string name="device_owner_info" msgid="3716661456037934467">"This device will be managed, monitored and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms will apply. <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
-    <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"This device will be managed, monitored and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms from <xliff:g id="TERMS_HEADERS">%2$s</xliff:g> will apply. <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
+    <string name="device_owner_info" msgid="2883639372446424007">"This device will be managed and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms will apply. <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
+    <string name="device_owner_info_with_terms_headers" msgid="7333703548160002079">"This device will be managed and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms from <xliff:g id="TERMS_HEADERS">%2$s</xliff:g> will apply. <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
     <string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"This link isn\'t secure and can\'t be opened until device setup is finished: <xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>"</string>
     <string name="contact_device_provider" msgid="9100405424740726066">"If you have questions, contact your <xliff:g id="ORGANIZATIONS_ADMIN">%1$s</xliff:g>."</string>
     <string name="if_questions_contact_admin" msgid="6147462485780267795">"If you have questions, contact your organisation\'s admin"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index bb44ed0..f4d2191 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -67,7 +67,6 @@
     <string name="setup_work_device" msgid="6003988351437862369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎Setting up work device…‎‏‎‎‏‎"</string>
     <string name="progress_data_process" msgid="1707745321954672971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎Processing setup data…‎‏‎‎‏‎"</string>
     <string name="progress_connect_to_wifi" msgid="472251154628863539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎Connecting to Wi-Fi…‎‏‎‎‏‎"</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎Connecting to mobile network…‎‏‎‎‏‎"</string>
     <string name="progress_download" msgid="3522436271691064624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎Downloading the admin app…‎‏‎‎‏‎"</string>
     <string name="progress_install" msgid="2258045670385866183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎Installing the admin app…‎‏‎‎‏‎"</string>
     <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎Removing non-required system apps…‎‏‎‎‏‎"</string>
@@ -107,8 +106,8 @@
     <string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎You\'re about to create a work profile that\'ll be managed and monitored by your organization. Terms from ‎‏‎‎‏‏‎<xliff:g id="TERMS_HEADERS">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will apply.‎‏‎‎‏‎"</string>
     <string name="profile_owner_info_comp" msgid="9190421701126119142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organization. Terms will apply.‎‏‎‎‏‎"</string>
     <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organization. Terms from ‎‏‎‎‏‏‎<xliff:g id="TERMS_HEADERS">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will apply.‎‏‎‎‏‎"</string>
-    <string name="device_owner_info" msgid="3716661456037934467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎This device will be managed, monitored, and kept secure by ‎‏‎‎‏‏‎<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Terms will apply. ‎‏‎‎‏‏‎<xliff:g id="VIEW_TERMS">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎This device will be managed, monitored, and kept secure by ‎‏‎‎‏‏‎<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Terms from ‎‏‎‎‏‏‎<xliff:g id="TERMS_HEADERS">%2$s</xliff:g>‎‏‎‎‏‏‏‎ will apply. ‎‏‎‎‏‏‎<xliff:g id="VIEW_TERMS">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="device_owner_info" msgid="2883639372446424007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎This device will be managed and kept secure by ‎‏‎‎‏‏‎<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Terms will apply. ‎‏‎‎‏‏‎<xliff:g id="VIEW_TERMS">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="device_owner_info_with_terms_headers" msgid="7333703548160002079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎This device will be managed and kept secure by ‎‏‎‎‏‏‎<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Terms from ‎‏‎‎‏‏‎<xliff:g id="TERMS_HEADERS">%2$s</xliff:g>‎‏‎‎‏‏‏‎ will apply. ‎‏‎‎‏‏‎<xliff:g id="VIEW_TERMS">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎This link isn\'t secure and can\'t be opened until device setup is finished: ‎‏‎‎‏‏‎<xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="contact_device_provider" msgid="9100405424740726066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎If you have questions, contact your ‎‏‎‎‏‏‎<xliff:g id="ORGANIZATIONS_ADMIN">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="if_questions_contact_admin" msgid="6147462485780267795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎If you have questions, contact your organization\'s admin‎‏‎‎‏‎"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0044aac..706cfd0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,8 +28,8 @@
     <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"Je apparaat wordt beheerd met de volgende app:"</string>
     <string name="next" msgid="1004321437324424398">"Volgende"</string>
     <string name="setting_up_workspace" msgid="7862472373642601041">"Werkprofiel instellen…"</string>
-    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"Je beheerder kan instellingen, zakelijke toegang, apps, machtigingen en gegevens die zijn gekoppeld aan dit profiel (waaronder je netwerkactiviteit) bijhouden en beheren, evenals de locatie, oproepgeschiedenis en zoekgeschiedenis voor contacten van je apparaat.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Neem contact op met je beheerder voor meer informatie en bij vragen over het privacybeleid van je organisatie."</string>
-    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"Je beheerder kan instellingen, zakelijke toegang, apps, machtigingen en gegevens die zijn gekoppeld aan dit apparaat (waaronder je netwerkactiviteit) bijhouden en beheren, evenals de locatie, oproepgeschiedenis en zoekgeschiedenis voor contacten van je apparaat.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Neem contact op met je beheerder voor meer informatie en bij vragen over het privacybeleid van je organisatie."</string>
+    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"Je beheerder kan instellingen, zakelijke toegang, apps, machtigingen en gegevens die zijn gekoppeld aan dit profiel (waaronder je netwerkactiviteit) bijhouden en beheren, evenals de locatie, gespreksgeschiedenis en zoekgeschiedenis voor contacten van je apparaat.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Neem contact op met je beheerder voor meer informatie en bij vragen over het privacybeleid van je organisatie."</string>
+    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"Je beheerder kan instellingen, zakelijke toegang, apps, machtigingen en gegevens die zijn gekoppeld aan dit apparaat (waaronder je netwerkactiviteit) bijhouden en beheren, evenals de locatie, gespreksgeschiedenis en zoekgeschiedenis voor contacten van je apparaat.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Neem contact op met je beheerder voor meer informatie en bij vragen over het privacybeleid van je organisatie."</string>
     <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"Als je diefstalbeveiligingsfuncties wilt gebruiken, moet je een met een wachtwoord beveiligde schermvergrendeling hebben ingesteld voor je apparaat."</string>
     <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"Neem contact op met je beheerder voor meer informatie, waaronder het privacybeleid van je organisatie."</string>
     <string name="learn_more_link" msgid="3012495805919550043">"Meer informatie"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 69801d1..51313c4 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -19,143 +19,255 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2400883737290705700">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‍"</string>
+    <!-- no translation found for app_label (2400883737290705700) -->
+    <skip />
     <string name="provisioning_error_title" msgid="6320515739861578118">"ଓହୋ!"</string>
-    <string name="setup_work_profile" msgid="1468934631731845267">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‍ କରନ୍ତୁ"</string>
+    <!-- no translation found for setup_work_profile (1468934631731845267) -->
+    <skip />
     <string name="company_controls_workspace" msgid="2808025277267917221">"ଆପଣଙ୍କ ସଂସ୍ଥା ଏହି ପ୍ରୋଫାଇଲକୁ ନିୟନ୍ତ୍ରଣ କରେ ଏବଂ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ। ଡିଭାଇସ୍‌ରେ ବାକି ସବୁକିଛି ଆପଣ ନିଜେ ନିୟନ୍ତ୍ରଣ କରନ୍ତି।"</string>
-    <string name="company_controls_device" msgid="8230957518758871390">"ଆପଣଙ୍କ ସଂସ୍ଥା ଏହି ଡିଭାଇସକୁ ନିୟନ୍ତ୍ରଣ କରିବ ଏବଂ ଏହାକୁ ସୁରକ୍ଷିତ ରଖିବ।"</string>
+    <!-- no translation found for company_controls_device (8230957518758871390) -->
+    <skip />
     <string name="the_following_is_your_mdm" msgid="6613658218262376404">"ନିମ୍ନ ଆପ୍‌ ଏହି ପ୍ରୋଫାଇଲକୁ ଆକ୍ସେସ୍‌ କରିବ:"</string>
     <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"ନିମ୍ନ ଆପ୍‍ ଆପଣଙ୍କ ଡିଭାଇସକୁ ପରିଚାଳନା କରିବ:"</string>
-    <string name="next" msgid="1004321437324424398">"ପରବର୍ତ୍ତୀ"</string>
-    <string name="setting_up_workspace" msgid="7862472373642601041">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‌ କରାଯାଉଛି…"</string>
-    <string name="admin_has_ability_to_monitor_profile" msgid="4552308842716093826">"ଆପଣଙ୍କ ନେଟୱର୍କ କାର୍ଯ୍ୟକଳାପ ତଥା ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେଶନ୍‍, କଲ୍‍ ହିଷ୍ଟୋରୀ, ଏବଂ କଣ୍ଟେଣ୍ଟ ସର୍ଚ୍ଚ ହିଷ୍ଟୋରୀ ସମେତ ସେଟିଙ୍ଗ, କର୍ପୋରେଟ୍‌ ଆକ୍ସେସ୍‌, ଆପ୍‍ ଅନୁମତି, ଏବଂ ଏହି ପ୍ରୋଫାଇଲରେ ସମ୍ପୃକ୍ତ ଥିବା ଡାଟା ଆପଣଙ୍କ ଆଡମିନ୍‌ ନୀରିକ୍ଷଣ ତଥା ପରିଚାଳନା କରିପାରିବେ।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>ଆପଣଙ୍କ ସଂସ୍ଥାର ଗୋପନୀୟତା ପଲିସୀ ସମେତ, ଅଧିକ ସୂଚନା ପାଇଁ, ନିଜ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"ଆପଣଙ୍କ ନେଟ୍‌ୱର୍କ କାର୍ଯ୍ୟକଳାପ ତଥା ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେଶନ୍‍, କଲ୍‍ ହିଷ୍ଟୋରୀ ଏବଂ କଣ୍ଟେଣ୍ଟ ସର୍ଚ୍ଚ ହିଷ୍ଟୋରୀ ସମେତ ସେଟିଙ୍ଗ, କର୍ପୋରେଟ୍‌ ଆକ୍ସେସ୍‌, ଆପ୍‍ ଅନୁମତି ଏବଂ ଏହି ଡିଭାଇସରେ ସମ୍ପୃକ୍ତ ଥିବା ଡାଟା ଆପଣଙ୍କ ଆଡମିନ୍‌ ନିରୀକ୍ଷଣ ତଥା ପରିଚାଳନା କରିପାରିବ।<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>ଆପଣଙ୍କ ସଂସ୍ଥାର ଗୋପନୀୟତା ନୀତି ସମେତ, ଅଧିକ ସୂଚନା ପାଇଁ, ନିଜ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"ଚୋରି-ପ୍ରତିରକ୍ଷା ବିଶେଷତା ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ଏକ ପାସ୍‌ୱର୍ଡ-ସୁରକ୍ଷିତ ସ୍କ୍ରୀନ୍‍ ଲକ୍‍ ଥିବା ଜରୁରୀ।"</string>
-    <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"ଆପଣଙ୍କ ସଂସ୍ଥାର ଗୋପନୀୟତା ନୀତି ସମେତ ଅଧିକ ସୂଚନା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନ୍‌ଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
+    <!-- no translation found for next (1004321437324424398) -->
+    <skip />
+    <!-- no translation found for setting_up_workspace (7862472373642601041) -->
+    <skip />
+    <!-- no translation found for admin_has_ability_to_monitor_profile (4552308842716093826) -->
+    <skip />
+    <!-- no translation found for admin_has_ability_to_monitor_device (8598573866079474861) -->
+    <skip />
+    <!-- no translation found for theft_protection_disabled_warning (3708092473574738478) -->
+    <skip />
+    <!-- no translation found for contact_your_admin_for_more_info (5959191345827902911) -->
+    <skip />
     <string name="learn_more_link" msgid="3012495805919550043">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="cancel_setup" msgid="2949928239276274745">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
-    <string name="ok_setup" msgid="4593707675416137504">"ଠିକ୍‌ ଅଛି"</string>
-    <string name="user_consent_msg" msgid="8820951802130353584">"ମୁଁ ସହମତି ଦେଉଛି"</string>
-    <string name="url_error" msgid="5958494012986243186">"ଏହି ଲିଙ୍କ ଡିସପ୍ଲେ କରାଯାଇପାରିବ ନାହିଁ।"</string>
-    <string name="terms" msgid="8295436105384703903">"ସର୍ତ୍ତାବଳୀ"</string>
-    <string name="work_profile_info" msgid="5433388376309583996">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସୂଚନା"</string>
-    <string name="managed_device_info" msgid="1529447646526616811">"ପରିଚାଳିତ ଡିଭାଇସ୍‌ ସୂଚନା"</string>
+    <!-- no translation found for ok_setup (4593707675416137504) -->
+    <skip />
+    <!-- no translation found for user_consent_msg (8820951802130353584) -->
+    <skip />
+    <!-- no translation found for url_error (5958494012986243186) -->
+    <skip />
+    <!-- no translation found for terms (8295436105384703903) -->
+    <skip />
+    <!-- no translation found for work_profile_info (5433388376309583996) -->
+    <skip />
+    <!-- no translation found for managed_device_info (1529447646526616811) -->
+    <skip />
     <string name="default_managed_profile_name" msgid="5370257687074907055">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‌"</string>
-    <string name="default_first_meat_user_name" msgid="7540515892748490540">"ପ୍ରାଥମିକ ୟୁଜର୍‍"</string>
-    <string name="delete_profile_title" msgid="2841349358380849525">"ବର୍ତ୍ତମାନ ଥିବା ପ୍ରୋଫାଇଲ୍‍ ଡିଲିଟ କରିବେ?"</string>
-    <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"ପୂର୍ବରୁ ଆପଣଙ୍କର ଏକ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ରହିଛି। ନିମ୍ନ ଆପ୍‍ ବ୍ୟବହାର କରି ଏହା ପରିଚାଳନା କରାଯାଇଥାଏ:"</string>
+    <!-- no translation found for default_first_meat_user_name (7540515892748490540) -->
+    <skip />
+    <!-- no translation found for delete_profile_title (2841349358380849525) -->
+    <skip />
+    <!-- no translation found for opening_paragraph_delete_profile (4913885310795775967) -->
+    <skip />
     <string name="read_more_delete_profile" msgid="7789171620401666343">"ଆଗକୁ ବଢ଼ିବା ପୂର୍ବରୁ, "<a href="#read_this_link">"ଏହା ପଢ଼ନ୍ତୁ"</a>"।"</string>
-    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"ଯଦି ଆପଣ ଜାରି ରଖନ୍ତି, ଏହି ପ୍ରୋଫାଇଲ୍‌ରେ ଥିବା ସମସ୍ତ ଆପ୍‍ ଓ ଡାଟା ଡିଲିଟ୍‍ ହୋଇଯିବ।"</string>
+    <!-- no translation found for sure_you_want_to_delete_profile (6927697984573575564) -->
+    <skip />
     <string name="delete_profile" msgid="2299218578684663459">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
-    <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‍ କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସକୁ ପ୍ରଥମେ ଏନକ୍ରୀପ୍ଟ କରିବା ଆବଶ୍ୟକ। ଏହା କିଛି ସମୟ ନେଇପାରେ।"</string>
-    <string name="encrypt_device_text_for_device_owner_setup" msgid="5194673142404735676">"ଏହି ଡିଭାଇସ୍‍ ସେଟଅପ୍‍ କରିବାକୁ, ଏହାକୁ ପ୍ରଥମେ ଏନକ୍ରୀପ୍ଟ କରିବା ଆବଶ୍ୟକ। ଏହା କିଛି ସମୟ ନେଇପାରେ।"</string>
-    <string name="encrypt_this_device_question" msgid="8719916619866892601">"ଏହି ଡିଭାଇସକୁ ଏନକ୍ରୀପ୍ଟ କରିବେ?"</string>
-    <string name="encrypt" msgid="1749320161747489212">"ଏନ୍‌କ୍ରୀପ୍ଟ କରନ୍ତୁ"</string>
+    <!-- no translation found for encrypt_device_text_for_profile_owner_setup (7828515754696057140) -->
+    <skip />
+    <!-- no translation found for encrypt_device_text_for_device_owner_setup (5194673142404735676) -->
+    <skip />
+    <!-- no translation found for encrypt_this_device_question (8719916619866892601) -->
+    <skip />
+    <!-- no translation found for encrypt (1749320161747489212) -->
+    <skip />
     <string name="continue_provisioning_notify_title" msgid="5191449100153186648">"ଏନକ୍ରିପଶନ୍ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା"</string>
-    <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‍ ଜାରି ରଖିବା ପାଇଁ ଟାପ୍‍ କରନ୍ତୁ"</string>
+    <!-- no translation found for continue_provisioning_notify_text (1066841819786425980) -->
+    <skip />
     <string name="managed_provisioning_error_text" msgid="7063621174570680890">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‌ ସେଟ୍ ଅପ୍ କରାଯାଇପାରିଲା ନାହିଁ। ଆପଣଙ୍କ IT ବିଭାଗ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ କିମ୍ୱା କିଛି ସମୟ ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="cant_add_work_profile" msgid="9217268909964154934">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଯୋଡ଼ିପାରିବ ନାହିଁ"</string>
-    <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ବଦଳାଇ ପାରିବ ନାହିଁ କିମ୍ବା ବାହାର କରିପାରିବ ନାହିଁ"</string>
-    <string name="work_profile_cant_be_added_contact_admin" msgid="4740182491195894659">"ଏହି ଡିଭାଇସରେ ଏକ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଯୋଡ଼ାଯାଇ ପାରିବ ନାହିଁ। ଯଦି ଆପଣଙ୍କର କୌଣସି ପ୍ରଶ୍ନ ରହିଥାଏ, ନିଜ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="change_device_launcher" msgid="4523563368433637980">"ଡିଭାଇସ୍‍ ଲଞ୍ଚର୍‍ ବଦଳାନ୍ତୁ"</string>
-    <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଦ୍ୱାରା ଲଞ୍ଚର୍‍ ଆପ୍‍ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <!-- no translation found for cant_add_work_profile (9217268909964154934) -->
+    <skip />
+    <!-- no translation found for cant_replace_or_remove_work_profile (7861054306792698290) -->
+    <skip />
+    <!-- no translation found for work_profile_cant_be_added_contact_admin (4740182491195894659) -->
+    <skip />
+    <!-- no translation found for change_device_launcher (4523563368433637980) -->
+    <skip />
+    <!-- no translation found for launcher_app_cant_be_used_by_work_profile (3524366082000739743) -->
+    <skip />
     <string name="cancel_provisioning" msgid="3408069559452653724">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
     <string name="pick_launcher" msgid="4257084827403983845">"ଠିକ୍‌ ଅଛି"</string>
-    <string name="user_setup_incomplete" msgid="6494920045526591079">"ୟୁଜର୍‍ ସେଟ୍‌ ଅପ୍‍ ଅସମ୍ପୂର୍ଣ୍ଣ"</string>
+    <!-- no translation found for user_setup_incomplete (6494920045526591079) -->
+    <skip />
     <string name="default_owned_device_username" msgid="3915120202811807955">"ୱର୍କ ଡିଭାଇସ୍‌ର ୟୁଜର୍‍"</string>
-    <string name="setup_work_device" msgid="6003988351437862369">"ୱର୍କ ଡିଭାଇସ୍‍ ସେଟଅପ୍‌ କରାଯାଉଛି…"</string>
-    <string name="progress_data_process" msgid="1707745321954672971">"ସେଟ୍‌ ଅପ୍‍ ଡାଟାକୁ ପ୍ରୋସେସ୍‍ କରାଯାଉଛି…"</string>
-    <string name="progress_connect_to_wifi" msgid="472251154628863539">"ୱାଇ-ଫାଇ ସହ ସଂଯୋଗ କରାଯାଉଛି…"</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"ମୋବାଇଲ୍ ନେଟ୍‍ୱର୍କ ସହ କନେକ୍ଟ ହେଉଛି…"</string>
-    <string name="progress_download" msgid="3522436271691064624">"ଆଡମିନ୍‍ ଆପ୍‍ ଡାଉନଲୋଡ୍‍ କରାଯାଉଛି…"</string>
-    <string name="progress_install" msgid="2258045670385866183">"ଆଡମିନ୍‍ ଆପ୍‍ ଇନଷ୍ଟଲ୍‍ କରାଯାଉଛି…"</string>
-    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"ଅନାବଶ୍ୟକ ସିଷ୍ଟମ୍‍ ଆପ୍‍ ବାହାର କରାଯାଉଛି…"</string>
-    <string name="progress_finishing_touches" msgid="9037776404089697198">"ଅନ୍ତିମ ସ୍ପର୍ଶ ଦିଆଯାଉଛି…"</string>
-    <string name="progress_set_owner" msgid="8214062820093757961">"ଡିଭାଇସ୍‍ ମାଲିକ ସେଟ୍ କରାଯାଉଛି…"</string>
-    <string name="progress_initialize" msgid="1104643492713424939">"ଡିଭାଇସ୍‍ ଆରମ୍ଭ କରାଯାଉଛି…"</string>
-    <string name="device_doesnt_allow_encryption_contact_admin" msgid="8297141458771829628">"ଏହି ଡିଭାଇସରେ ଏନକ୍ରୀପସନ୍‍ କରାଯାଇ ପାରିବ ନାହିଁ, ଯାହା ସେଟଅପ୍‍ ପାଇଁ ଆବଶ୍ୟକ ଅଟେ। ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"ସେଟଅପ୍‍ ବନ୍ଦ କରିବେ ଏବଂ ଡିଭାଇସ୍‍ ରିସେଟ୍‍ କରିବେ କି?"</string>
-    <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"ଏହା ଦ୍ୱାରା ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ରିସେଟ୍ ହେବ ଏବଂ ଆପଣଙ୍କୁ ପ୍ରଥମ ସ୍କ୍ରୀନକୁ ନିଆଯିବ।"</string>
-    <string name="device_owner_cancel_message" msgid="2529288571742712065">"ସେଟ୍‍ ଅପ୍‍ କରିବା ବନ୍ଦ କରି ଆପଣଙ୍କ ଡିଉଭାଇସ୍‌ର ଡାଟା ଲିଭାଇଦେବେ?"</string>
+    <!-- no translation found for setup_work_device (6003988351437862369) -->
+    <skip />
+    <!-- no translation found for progress_data_process (1707745321954672971) -->
+    <skip />
+    <!-- no translation found for progress_connect_to_wifi (472251154628863539) -->
+    <skip />
+    <!-- no translation found for progress_download (3522436271691064624) -->
+    <skip />
+    <!-- no translation found for progress_install (2258045670385866183) -->
+    <skip />
+    <!-- no translation found for progress_delete_non_required_apps (7633458399262691256) -->
+    <skip />
+    <!-- no translation found for progress_finishing_touches (9037776404089697198) -->
+    <skip />
+    <!-- no translation found for progress_set_owner (8214062820093757961) -->
+    <skip />
+    <!-- no translation found for progress_initialize (1104643492713424939) -->
+    <skip />
+    <!-- no translation found for device_doesnt_allow_encryption_contact_admin (8297141458771829628) -->
+    <skip />
+    <!-- no translation found for stop_setup_reset_device_question (7547191251522623210) -->
+    <skip />
+    <!-- no translation found for this_will_reset_take_back_first_screen (4623290347188404725) -->
+    <skip />
+    <!-- no translation found for device_owner_cancel_message (2529288571742712065) -->
+    <skip />
     <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"ଠିକ୍‌ ଅଛି"</string>
-    <string name="reset" msgid="6467204151306265796">"ରିସେଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="cant_set_up_profile" msgid="4341825293970158436">"ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍‍ ଅପ୍‍ କରିପାରିବ ନାହିଁ"</string>
-    <string name="cant_set_up_device" msgid="4120090138983350714">"ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରିପାରିବ ନାହିଁ"</string>
-    <string name="couldnt_set_up_device" msgid="60699158233724802">"ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରାଯାଇପାରିଲା ନାହିଁ। ସହାୟତା ପାଇଁ, ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="contact_your_admin_for_help" msgid="8045606258802719235">"ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
-    <string name="device_already_set_up" msgid="507881934487140294">"ଡିଭାଇସ୍‍ ପୂର୍ବରୁ ସେଟଅପ୍‌ କରାଯାଇଛି"</string>
+    <!-- no translation found for reset (6467204151306265796) -->
+    <skip />
+    <!-- no translation found for cant_set_up_profile (4341825293970158436) -->
+    <skip />
+    <!-- no translation found for cant_set_up_device (4120090138983350714) -->
+    <skip />
+    <!-- no translation found for couldnt_set_up_device (60699158233724802) -->
+    <skip />
+    <!-- no translation found for contact_your_admin_for_help (8045606258802719235) -->
+    <skip />
+    <!-- no translation found for device_already_set_up (507881934487140294) -->
+    <skip />
     <string name="device_owner_error_wifi" msgid="4256310285761332378">"ୱାଇ-ଫାଇ ସହ ସଂଯୋଗ ହୋଇପାରିଲା ନାହିଁ"</string>
-    <string name="device_has_reset_protection_contact_admin" msgid="1221351721899290155">"ଆପଣଙ୍କ ଡିଭାଇସରେ ରିସେଟ୍‍ ସୁରକ୍ଷା ଅନ୍‍ କରାଯାଇଛି। ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="frp_clear_progress_title" msgid="8628074089458234965">"ଲିଭାଯାଉଛି"</string>
-    <string name="frp_clear_progress_text" msgid="1740164332830598827">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ..."</string>
-    <string name="device_owner_error_hash_mismatch" msgid="7256273143549784838">"ଚେକସମ୍‍ ତ୍ରୁଟି ହେତୁ ଆଡମିନ୍‍ ଆପ୍‍ ବ୍ୟବହାର କରିପାରିଲା ନାହିଁ। ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
+    <!-- no translation found for device_has_reset_protection_contact_admin (1221351721899290155) -->
+    <skip />
+    <!-- no translation found for frp_clear_progress_title (8628074089458234965) -->
+    <skip />
+    <!-- no translation found for frp_clear_progress_text (1740164332830598827) -->
+    <skip />
+    <!-- no translation found for device_owner_error_hash_mismatch (7256273143549784838) -->
+    <skip />
     <string name="device_owner_error_download_failed" msgid="4520111971592657116">"ଆଡମିନ୍‍ ଆପ୍‌କୁ ଡାଉନଲୋଡ୍ କରାଯାଇପାରିଲା ନାହିଁ"</string>
-    <string name="device_owner_error_package_invalid" msgid="1096901016820157695">"ଆଡମିନ୍‍ ଆପ୍‍ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ। ଏହି କମ୍ପୋନେଟ୍‍ ନାହିଁ କିମ୍ବା ଖରାପ ହୋଇଯାଇଛି। ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
+    <!-- no translation found for device_owner_error_package_invalid (1096901016820157695) -->
+    <skip />
     <string name="device_owner_error_installation_failed" msgid="684566845601079360">"ଆଡମିନ୍‍ ଆପ୍‌ ଇନ୍‍ଷ୍ଟଲ୍‍ କରାଯାଇପାରିଲା ନାହିଁ।"</string>
-    <string name="profile_owner_cancel_message" msgid="6868736915633023477">"ସେଟ୍‌ ଅପ୍‍ କରିବା ବନ୍ଦ କରିବେ?"</string>
+    <!-- no translation found for profile_owner_cancel_message (6868736915633023477) -->
+    <skip />
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"ନା"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"ହଁ"</string>
-    <string name="profile_owner_cancelling" msgid="5679573829145112822">"କ୍ୟାନ୍ସଲ୍‍ କରାଯାଉଛି…"</string>
-    <string name="work_profile_setup_later_title" msgid="9069148190226279892">"ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍‌ ଅପ୍‍ ବନ୍ଦ କରିବେ?"</string>
-    <string name="work_profile_setup_later_message" msgid="122069011117225292">"ଆପଣଙ୍କ ସ6ସ୍ଥାର ଡିଭାଇସ ପରିଚାଳନା ଆପରେ ନିଜ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଆପଣ ପରେ ସେଟଅପ୍‍ କରିପାରିବେ।"</string>
-    <string name="continue_button" msgid="7177918589510964446">"ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="work_profile_setup_stop" msgid="6772128629992514750">"ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="dismiss" msgid="9009534756748565880">"ଖାରଜ କରନ୍ତୁ"</string>
-    <string name="profile_owner_info" msgid="8975319972303812298">"ଆପଣ ଏକ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ତିଆରି କରିବାକୁ ଯାଉଛନ୍ତି ଯାହା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳନା ତଥା ନୀରିକ୍ଷଣ କରାଯିବ। ସର୍ତ୍ତାବଳୀ ଲାଗୁ ହେବ।"</string>
-    <string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"ଆପଣ ଏକ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ତିଆରି କରିବାକୁ ଯାଉଛନ୍ତି ଯାହା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳନା ତଥା ନୀରିକ୍ଷଣ କରାଯିବ। <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>ଙ୍କ ସର୍ତ୍ତାବଳୀ ଲାଗୁ ହେବ।"</string>
-    <string name="profile_owner_info_comp" msgid="9190421701126119142">"ଆପଣଙ୍କ ୱର୍କ ଆପଗୁଡ଼ିକ ପାଇଁ ଏକ ପ୍ରୋଫାଇଲ୍‍ ତିଆରି କରାଯିବ। ଏହି ପ୍ରୋଫାଇଲ୍‍ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସର ଅବଶିଷ୍ଟ ସବୁକିଛି ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳନା ତଥା ନୀରିକ୍ଷଣ କରାଯିବ। ସର୍ତ୍ତାବଳୀ ଲାଗୁ ହେବ।"</string>
-    <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"ଆପଣଙ୍କ ୱର୍କ ଆପଗୁଡ଼ିକ ପାଇଁ ଏକ ପ୍ରୋଫାଇଲ୍‍ ତିଆରି କରାଯିବ। ଏହି ପ୍ରୋଫାଇଲ୍‍ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସର ଅବଶିଷ୍ଟ ସବୁକିଛି ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳନା ତଥା ନୀରିକ୍ଷଣ କରାଯିବ। <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>ଙ୍କ ସର୍ତ୍ତାବଳୀ ଲାଗୁ ହେବ।"</string>
-    <string name="device_owner_info" msgid="3716661456037934467">"ଏହି ଡିଭାଇସ୍‌କୁ <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>ଦ୍ଵାରା ପରିଚାଳିତ, ତଦାରଖ ଓ ସୁରକ୍ଷିତ କରାଯିବ। ସର୍ତ୍ତ ଲାଗୁ ହେବ। <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
-    <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"ଏହି ଡିଭାଇସ୍‌କୁ <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>ଦ୍ଵାରା ପରିଚାଳିତ, ତଦାରଖ ଓ ସୁରକ୍ଷିତ କରାଯିବ। <xliff:g id="TERMS_HEADERS">%2$s</xliff:g>ରୁ ସର୍ତ୍ତ ଲାଗୁ ହେବ। <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
-    <string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"ଏହି ଲିଙ୍କ ସୁରକ୍ଷିତ ନୁହେଁ ଏବଂ ଡିଭାଇସ୍ ସେଟଅପ୍‍ ସମାପ୍ତ ନହେବା ପର୍ଯ୍ୟନ୍ତ ଖୋଲାଯାଇ ପାରିବ ନାହିଁ: <xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>"</string>
-    <string name="contact_device_provider" msgid="9100405424740726066">"ଯଦି ଆପଣଙ୍କର ପ୍ରଶ୍ନ ରହିଛି, ଆପଣଙ୍କ <xliff:g id="ORGANIZATIONS_ADMIN">%1$s</xliff:g> ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="if_questions_contact_admin" msgid="6147462485780267795">"ଯଦି ଆପଣଙ୍କ ପ୍ରଶ୍ନ ରହିଥାଏ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
-    <string name="setup_isnt_finished_contact_admin" msgid="235011880559615998">"ସେଟଅପ୍ ସମାପ୍ତ ହୋଇନାହିଁ। ସହାୟତା ପାଇଁ, ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="for_help_contact_admin" msgid="8687037236275184653">"ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
-    <string name="organization_admin" msgid="1595001081906025683">"ସଂସ୍ଥାର ଆଡମିନ୍‍"</string>
-    <string name="your_org_app_used" msgid="5336414768293540831">"ନିମ୍ନ ଆପ୍‍ ବ୍ୟବହାର କରି <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> ଏହି ଡିଭାଇସ୍‍ ପରିଚାଳନା ଓ ନୀରିକ୍ଷଣ କରିବ:"</string>
-    <string name="your_organization_beginning" msgid="5952561489910967255">"ଆପଣଙ୍କ ସଂସ୍ଥା"</string>
-    <string name="your_organization_middle" msgid="8288538158061644733">"ଆପଣଙ୍କ ସଂସ୍ଥା"</string>
-    <string name="view_terms" msgid="7230493092383341605">"ସର୍ତ୍ତାବଳୀ ଦେଖନ୍ତୁ"</string>
-    <string name="accept_and_continue" msgid="1632679734918410653">"ସ୍ୱୀକାର କରନ୍ତୁ ଏବଂ ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="close" msgid="7208600934846389439">"ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="set_up_your_device" msgid="1896651520959894681">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
-    <string name="info_anim_title_0" msgid="3285414600215959704">"ଆପଣ କାମ କରିବା ପଦ୍ଧତି ବଦଳାନ୍ତୁ"</string>
-    <string name="info_anim_title_1" msgid="2657512519467714760">"ବ୍ୟକ୍ତିଗତଠାରୁ କାମକୁ ଅଲଗା କରନ୍ତୁ"</string>
-    <string name="one_place_for_work_apps" msgid="2595597562302953960">"ୱର୍କ ଆପ୍‍ ପାଇଁ ଗୋଟିଏ ସ୍ଥାନ"</string>
-    <string name="info_anim_title_2" msgid="4629781398620470204">"ଆପଣ କରିସାରିବା ପରେ ୱର୍କ ଅଫ୍‍ କରିଦିଅନ୍ତୁ"</string>
+    <!-- no translation found for profile_owner_cancelling (5679573829145112822) -->
+    <skip />
+    <!-- no translation found for work_profile_setup_later_title (9069148190226279892) -->
+    <skip />
+    <!-- no translation found for work_profile_setup_later_message (122069011117225292) -->
+    <skip />
+    <!-- no translation found for continue_button (7177918589510964446) -->
+    <skip />
+    <!-- no translation found for work_profile_setup_stop (6772128629992514750) -->
+    <skip />
+    <!-- no translation found for dismiss (9009534756748565880) -->
+    <skip />
+    <!-- no translation found for profile_owner_info (8975319972303812298) -->
+    <skip />
+    <!-- no translation found for profile_owner_info_with_terms_headers (7373591910245655373) -->
+    <skip />
+    <!-- no translation found for profile_owner_info_comp (9190421701126119142) -->
+    <skip />
+    <!-- no translation found for profile_owner_info_with_terms_headers_comp (2012766614492554556) -->
+    <skip />
+    <!-- no translation found for device_owner_info (2883639372446424007) -->
+    <skip />
+    <!-- no translation found for device_owner_info_with_terms_headers (7333703548160002079) -->
+    <skip />
+    <!-- no translation found for link_isnt_secure_and_cant_be_opened_until_device_setup_finished (1604497932637832657) -->
+    <skip />
+    <!-- no translation found for contact_device_provider (9100405424740726066) -->
+    <skip />
+    <!-- no translation found for if_questions_contact_admin (6147462485780267795) -->
+    <skip />
+    <!-- no translation found for setup_isnt_finished_contact_admin (235011880559615998) -->
+    <skip />
+    <!-- no translation found for for_help_contact_admin (8687037236275184653) -->
+    <skip />
+    <!-- no translation found for organization_admin (1595001081906025683) -->
+    <skip />
+    <!-- no translation found for your_org_app_used (5336414768293540831) -->
+    <skip />
+    <!-- no translation found for your_organization_beginning (5952561489910967255) -->
+    <skip />
+    <!-- no translation found for your_organization_middle (8288538158061644733) -->
+    <skip />
+    <!-- no translation found for view_terms (7230493092383341605) -->
+    <skip />
+    <!-- no translation found for accept_and_continue (1632679734918410653) -->
+    <skip />
+    <!-- no translation found for close (7208600934846389439) -->
+    <skip />
+    <!-- no translation found for set_up_your_device (1896651520959894681) -->
+    <skip />
+    <!-- no translation found for info_anim_title_0 (3285414600215959704) -->
+    <skip />
+    <!-- no translation found for info_anim_title_1 (2657512519467714760) -->
+    <skip />
+    <!-- no translation found for one_place_for_work_apps (2595597562302953960) -->
+    <skip />
+    <!-- no translation found for info_anim_title_2 (4629781398620470204) -->
+    <skip />
     <string name="provisioning" msgid="4512493827019163451">"ପ୍ରାବଧାନ କରାଯାଉଛି"</string>
     <string name="copying_certs" msgid="5697938664953550881">"CA ସର୍ଟିଫିକେଟ୍‍ ସେଟ୍‍ କରାଯାଉଛି"</string>
-    <string name="setup_profile" msgid="5573950582159698549">"ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="profile_benefits_description" msgid="758432985984252636">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ବ୍ୟବହାର କରିବା ଦ୍ୱାରା, ଆପଣ ବ୍ୟକ୍ତିଗତ ଡାଟାରୁ ୱର୍କ ଡାଟାକୁ ପୃଥକ କରିପାରିବେ"</string>
-    <string name="comp_profile_benefits_description" msgid="379837075456998273">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ବ୍ୟବହାର କରିବା ଦ୍ୱାରା, ନିଜ ୱର୍କ ଆପ୍‍ ଗୋଟିଏ ସ୍ଥାନରେ ଆପଣ ରଖିପାରିବେ"</string>
-    <string name="setup_profile_encryption" msgid="5241291404536277038">"ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ। ଏନକ୍ରୀପ୍ସନ୍‍"</string>
-    <string name="setup_profile_progress" msgid="7742718527853325656">"ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ। ପ୍ରଗତି ଦେଖାଉଛି"</string>
+    <!-- no translation found for setup_profile (5573950582159698549) -->
+    <skip />
+    <!-- no translation found for profile_benefits_description (758432985984252636) -->
+    <skip />
+    <!-- no translation found for comp_profile_benefits_description (379837075456998273) -->
+    <skip />
+    <!-- no translation found for setup_profile_encryption (5241291404536277038) -->
+    <skip />
+    <!-- no translation found for setup_profile_progress (7742718527853325656) -->
+    <skip />
     <string name="setup_device" msgid="6725265673245816366">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
-    <string name="setup_device_encryption" msgid="7852944465414197103">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରନ୍ତୁ। ଏନକ୍ରୀପ୍ସନ୍‍"</string>
-    <string name="setup_device_progress" msgid="7035335208571175393">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ସେଟ୍ ଅପ୍ କରନ୍ତୁ। ପ୍ରଗତି ଦେଖାଉଛି"</string>
-    <string name="learn_more_label" msgid="2723716758654655009">"ଅଧିକ ଜାଣନ୍ତୁ ବଟନ୍‍"</string>
-    <string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g> ଆଇକନ୍‍"</string>
-    <string name="section_heading" msgid="3924666803774291908">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> ଭାଗ ଶୀର୍ଷନାମ।"</string>
-    <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> ଭାଗ କଣ୍ଟେଣ୍ଟ: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
-    <string name="expand" msgid="37188292156131304">"ବଢ଼ାନ୍ତୁ"</string>
-    <string name="collapse" msgid="7817530505064432580">"ଛୋଟ କରନ୍ତୁ"</string>
-    <string name="access_list_of_links" msgid="7094123315959323372">"ଲିଙ୍କର ଏକ ତାଲିକା ଆକ୍ସେସ୍‍ କରନ୍ତୁ"</string>
-    <string name="access_links" msgid="7991363727326168600">"ଲିଙ୍କ ଆକ୍ସେସ୍‍ କରନ୍ତୁ"</string>
-    <string name="access_terms" msgid="1982500872249763745">"ସର୍ତ୍ତାବଳୀ ଆକ୍ସେସ୍‍ କରନ୍ତୁ"</string>
-    <string name="read_terms" msgid="1745011123626640728">"ସର୍ତ୍ତାବଳୀ ପଢ଼ନ୍ତୁ"</string>
-    <string name="close_list" msgid="9053538299788717597">"ବନ୍ଦ କରୁଥିବା ତାଲିକା"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"ସେଟଅପ୍‍ ଶେଷ କରି ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‍ କରିବେ?"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"ଏହି ସେଟଅପ୍‍ ଶେଷ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ ଡିଭାଇସ୍ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‍ ହେବ ଏବଂ ଆପଣଙ୍କୁ ପ୍ରଥମ ସ୍କ୍ରୀନକୁ ନିଆଯିବ।"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"ଡିଭାଇସ୍‌ ରିସେଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="join_two_items" msgid="6110273439759895837">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ଏବଂ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
-    <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ଏବଂ <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
-    <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
-    <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="take_a_few_minutes" msgid="6282806501305322838">"ଏଥିପାଇଁ କିଛି ସମୟ ଲାଗିପାରେ"</string>
-    <string name="work_profile_description" msgid="8524116010729569213">"ଆପଣଙ୍କ କାର୍ଯ୍ୟକାରୀ ଆପ୍‌ଗୁଡ଼ିକୁ ଏହି ପ୍ରୋଫାଇଲ୍ ମଧ୍ୟରେ ରଖିବା ସହିତ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ଵାରା ପରିଚାଳିତ ହେବ"</string>
-    <string name="device_owner_description" msgid="168013145812679664">"ଏହି ଡିଭାଇସ୍‌କୁ ସୁରକ୍ଷିତ ରଖାଯିବ ଏବଂ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ଵାରା ପରିଚାଳିତ ହେବ"</string>
+    <!-- no translation found for setup_device_encryption (7852944465414197103) -->
+    <skip />
+    <!-- no translation found for setup_device_progress (7035335208571175393) -->
+    <skip />
+    <!-- no translation found for learn_more_label (2723716758654655009) -->
+    <skip />
+    <!-- no translation found for mdm_icon_label (3399134595549660561) -->
+    <skip />
+    <!-- no translation found for section_heading (3924666803774291908) -->
+    <skip />
+    <!-- no translation found for section_content (8875502515704374394) -->
+    <skip />
+    <!-- no translation found for expand (37188292156131304) -->
+    <skip />
+    <!-- no translation found for collapse (7817530505064432580) -->
+    <skip />
+    <!-- no translation found for access_list_of_links (7094123315959323372) -->
+    <skip />
+    <!-- no translation found for access_links (7991363727326168600) -->
+    <skip />
+    <!-- no translation found for access_terms (1982500872249763745) -->
+    <skip />
+    <!-- no translation found for read_terms (1745011123626640728) -->
+    <skip />
+    <!-- no translation found for close_list (9053538299788717597) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_title (5416045931532004811) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_msg (808442439937994485) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_cancel (2810966091829264727) -->
+    <skip />
+    <!-- no translation found for cancel_setup_and_factory_reset_dialog_ok (7168008267496150529) -->
+    <skip />
+    <!-- no translation found for join_two_items (6110273439759895837) -->
+    <skip />
+    <!-- no translation found for join_many_items_last (7469666990442158802) -->
+    <skip />
+    <!-- no translation found for join_many_items_first (8365482726853276608) -->
+    <skip />
+    <!-- no translation found for join_many_items_middle (8569294838319639963) -->
+    <skip />
+    <!-- no translation found for take_a_few_minutes (6282806501305322838) -->
+    <skip />
+    <!-- no translation found for work_profile_description (8524116010729569213) -->
+    <skip />
+    <!-- no translation found for device_owner_description (168013145812679664) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b07baa6..5a2f5c0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -32,7 +32,7 @@
     <string name="admin_has_ability_to_monitor_device" msgid="8598573866079474861">"ผู้ดูแลระบบสามารถตรวจสอบและจัดการการตั้งค่า การเข้าถึงของบริษัท แอป สิทธิ์ และข้อมูลที่เชื่อมโยงกับอุปกรณ์นี้ ซึ่งรวมถึงกิจกรรมในเครือข่ายของคุณ ตลอดจนตำแหน่งของอุปกรณ์ ประวัติการโทร และประวัติการค้นหารายชื่อติดต่อ<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>โปรดติดต่อผู้ดูแลระบบเพื่อสอบถามข้อมูลเพิ่มเติม รวมทั้งนโยบายความเป็นส่วนตัวขององค์กร"</string>
     <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"หากต้องการใช้ฟีเจอร์การป้องกันขโมย อุปกรณ์ของคุณต้องมีการล็อกหน้าจอที่ป้องกันด้วยรหัสผ่าน"</string>
     <string name="contact_your_admin_for_more_info" msgid="5959191345827902911">"ติดต่อผู้ดูแลระบบสำหรับข้อมูลเพิ่มเติม รวมถึงนโยบายความเป็นส่วนตัวขององค์กร"</string>
-    <string name="learn_more_link" msgid="3012495805919550043">"เรียนรู้เพิ่มเติม"</string>
+    <string name="learn_more_link" msgid="3012495805919550043">"ดูข้อมูลเพิ่มเติม"</string>
     <string name="cancel_setup" msgid="2949928239276274745">"ยกเลิก"</string>
     <string name="ok_setup" msgid="4593707675416137504">"ตกลง"</string>
     <string name="user_consent_msg" msgid="8820951802130353584">"ฉันยินยอม"</string>
@@ -136,7 +136,7 @@
     <string name="setup_device" msgid="6725265673245816366">"ตั้งค่าอุปกรณ์"</string>
     <string name="setup_device_encryption" msgid="7852944465414197103">"ตั้งค่าอุปกรณ์ การเข้ารหัส"</string>
     <string name="setup_device_progress" msgid="7035335208571175393">"ตั้งค่าอุปกรณ์ กำลังแสดงความคืบหน้า"</string>
-    <string name="learn_more_label" msgid="2723716758654655009">"ปุ่มเรียนรู้เพิ่มเติม"</string>
+    <string name="learn_more_label" msgid="2723716758654655009">"ปุ่มดูข้อมูลเพิ่มเติม"</string>
     <string name="mdm_icon_label" msgid="3399134595549660561">"ไอคอน <xliff:g id="ICON_LABEL">%1$s</xliff:g>"</string>
     <string name="section_heading" msgid="3924666803774291908">"หัวข้อของส่วน <xliff:g id="SECTION_HEADING">%1$s</xliff:g>"</string>
     <string name="section_content" msgid="8875502515704374394">"เนื้อหาของส่วน <xliff:g id="SECTION_HEADING">%1$s</xliff:g> คือ <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
diff --git a/src/com/android/managedprovisioning/analytics/AnalyticsUtils.java b/src/com/android/managedprovisioning/analytics/AnalyticsUtils.java
index 52e26c0..06bf0b0 100644
--- a/src/com/android/managedprovisioning/analytics/AnalyticsUtils.java
+++ b/src/com/android/managedprovisioning/analytics/AnalyticsUtils.java
@@ -24,8 +24,8 @@
 import android.content.Intent;
 import android.nfc.NdefRecord;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.managedprovisioning.parser.PropertiesProvisioningDataParser;
 import com.android.managedprovisioning.task.AbstractProvisioningTask;
diff --git a/src/com/android/managedprovisioning/common/AccessibilityContextMenuMaker.java b/src/com/android/managedprovisioning/common/AccessibilityContextMenuMaker.java
index 977a677..a57b72e 100644
--- a/src/com/android/managedprovisioning/common/AccessibilityContextMenuMaker.java
+++ b/src/com/android/managedprovisioning/common/AccessibilityContextMenuMaker.java
@@ -18,8 +18,8 @@
 import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Spanned;
 import android.text.style.ClickableSpan;
 import android.view.ContextMenu;
diff --git a/src/com/android/managedprovisioning/common/ClickableSpanFactory.java b/src/com/android/managedprovisioning/common/ClickableSpanFactory.java
index cc8c24c..52f3631 100644
--- a/src/com/android/managedprovisioning/common/ClickableSpanFactory.java
+++ b/src/com/android/managedprovisioning/common/ClickableSpanFactory.java
@@ -16,7 +16,7 @@
 package com.android.managedprovisioning.common;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.view.SoundEffectConstants;
diff --git a/src/com/android/managedprovisioning/common/ManagedProvisioningSharedPreferences.java b/src/com/android/managedprovisioning/common/ManagedProvisioningSharedPreferences.java
index a17015c..003bd34 100644
--- a/src/com/android/managedprovisioning/common/ManagedProvisioningSharedPreferences.java
+++ b/src/com/android/managedprovisioning/common/ManagedProvisioningSharedPreferences.java
@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 public class ManagedProvisioningSharedPreferences {
     public static final long DEFAULT_PROVISIONING_ID = 0L;
diff --git a/src/com/android/managedprovisioning/common/PersistableBundlable.java b/src/com/android/managedprovisioning/common/PersistableBundlable.java
index a7ee33b..0e26378 100644
--- a/src/com/android/managedprovisioning/common/PersistableBundlable.java
+++ b/src/com/android/managedprovisioning/common/PersistableBundlable.java
@@ -18,7 +18,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/managedprovisioning/common/SetupGlifLayoutActivity.java b/src/com/android/managedprovisioning/common/SetupGlifLayoutActivity.java
index 1020cf5..90d375d 100644
--- a/src/com/android/managedprovisioning/common/SetupGlifLayoutActivity.java
+++ b/src/com/android/managedprovisioning/common/SetupGlifLayoutActivity.java
@@ -20,7 +20,7 @@
 import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.android.managedprovisioning.R;
 import com.android.setupwizardlib.GlifLayout;
diff --git a/src/com/android/managedprovisioning/common/SetupLayoutActivity.java b/src/com/android/managedprovisioning/common/SetupLayoutActivity.java
index 0c2069c..6ae5953 100644
--- a/src/com/android/managedprovisioning/common/SetupLayoutActivity.java
+++ b/src/com/android/managedprovisioning/common/SetupLayoutActivity.java
@@ -29,7 +29,7 @@
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/src/com/android/managedprovisioning/finalization/DpcReceivedSuccessReceiver.java b/src/com/android/managedprovisioning/finalization/DpcReceivedSuccessReceiver.java
index 193b7de..632be75 100644
--- a/src/com/android/managedprovisioning/finalization/DpcReceivedSuccessReceiver.java
+++ b/src/com/android/managedprovisioning/finalization/DpcReceivedSuccessReceiver.java
@@ -26,7 +26,7 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.UserHandle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.managedprovisioning.common.ProvisionLogger;
diff --git a/src/com/android/managedprovisioning/model/PackageDownloadInfo.java b/src/com/android/managedprovisioning/model/PackageDownloadInfo.java
index 872b32f..fbc3d1f 100644
--- a/src/com/android/managedprovisioning/model/PackageDownloadInfo.java
+++ b/src/com/android/managedprovisioning/model/PackageDownloadInfo.java
@@ -26,7 +26,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.android.internal.annotations.Immutable;
 import com.android.managedprovisioning.common.PersistableBundlable;
diff --git a/src/com/android/managedprovisioning/model/ProvisioningParams.java b/src/com/android/managedprovisioning/model/ProvisioningParams.java
index 167beef..90052ee 100644
--- a/src/com/android/managedprovisioning/model/ProvisioningParams.java
+++ b/src/com/android/managedprovisioning/model/ProvisioningParams.java
@@ -52,7 +52,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AtomicFile;
 import android.util.Xml;
 
diff --git a/src/com/android/managedprovisioning/model/WifiInfo.java b/src/com/android/managedprovisioning/model/WifiInfo.java
index 64ccd4e..d032a4d 100644
--- a/src/com/android/managedprovisioning/model/WifiInfo.java
+++ b/src/com/android/managedprovisioning/model/WifiInfo.java
@@ -30,7 +30,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.android.internal.annotations.Immutable;
 import com.android.managedprovisioning.common.PersistableBundlable;
diff --git a/src/com/android/managedprovisioning/parser/DeviceAdminIconParser.java b/src/com/android/managedprovisioning/parser/DeviceAdminIconParser.java
index 1324074..9d6d7e7 100644
--- a/src/com/android/managedprovisioning/parser/DeviceAdminIconParser.java
+++ b/src/com/android/managedprovisioning/parser/DeviceAdminIconParser.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.android.managedprovisioning.common.StoreUtils;
 
diff --git a/src/com/android/managedprovisioning/parser/DisclaimersParser.java b/src/com/android/managedprovisioning/parser/DisclaimersParser.java
index 1d97e8a..aa78652 100644
--- a/src/com/android/managedprovisioning/parser/DisclaimersParser.java
+++ b/src/com/android/managedprovisioning/parser/DisclaimersParser.java
@@ -24,8 +24,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import com.android.managedprovisioning.common.ProvisionLogger;
 import com.android.managedprovisioning.common.StoreUtils;
diff --git a/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java b/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java
index 4c03767..c6497fd 100644
--- a/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java
+++ b/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java
@@ -69,8 +69,8 @@
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserHandle;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.android.managedprovisioning.common.IllegalProvisioningArgumentException;
 import com.android.managedprovisioning.common.LogoUtils;
 import com.android.managedprovisioning.common.ManagedProvisioningSharedPreferences;
diff --git a/src/com/android/managedprovisioning/parser/MessageParser.java b/src/com/android/managedprovisioning/parser/MessageParser.java
index 16e417a..03c2f67 100644
--- a/src/com/android/managedprovisioning/parser/MessageParser.java
+++ b/src/com/android/managedprovisioning/parser/MessageParser.java
@@ -21,7 +21,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.android.managedprovisioning.common.IllegalProvisioningArgumentException;
 import com.android.managedprovisioning.common.Utils;
diff --git a/src/com/android/managedprovisioning/parser/PropertiesProvisioningDataParser.java b/src/com/android/managedprovisioning/parser/PropertiesProvisioningDataParser.java
index b4fc93a..3ff5be9 100644
--- a/src/com/android/managedprovisioning/parser/PropertiesProvisioningDataParser.java
+++ b/src/com/android/managedprovisioning/parser/PropertiesProvisioningDataParser.java
@@ -51,8 +51,8 @@
 import android.nfc.NfcAdapter;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.android.managedprovisioning.common.ManagedProvisioningSharedPreferences;
 import com.android.managedprovisioning.common.ProvisionLogger;
 import com.android.managedprovisioning.common.IllegalProvisioningArgumentException;
diff --git a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
index c2f9ca1..c4d83d4 100644
--- a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
@@ -29,7 +29,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
diff --git a/src/com/android/managedprovisioning/preprovisioning/WebActivity.java b/src/com/android/managedprovisioning/preprovisioning/WebActivity.java
index cf92577..eb18381 100644
--- a/src/com/android/managedprovisioning/preprovisioning/WebActivity.java
+++ b/src/com/android/managedprovisioning/preprovisioning/WebActivity.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.webkit.URLUtil;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
diff --git a/src/com/android/managedprovisioning/preprovisioning/anim/BenefitsAnimation.java b/src/com/android/managedprovisioning/preprovisioning/anim/BenefitsAnimation.java
index 9dd3a3a..4001ee7 100644
--- a/src/com/android/managedprovisioning/preprovisioning/anim/BenefitsAnimation.java
+++ b/src/com/android/managedprovisioning/preprovisioning/anim/BenefitsAnimation.java
@@ -25,7 +25,7 @@
 import android.graphics.drawable.Animatable2;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
diff --git a/src/com/android/managedprovisioning/preprovisioning/terms/TermsActivity.java b/src/com/android/managedprovisioning/preprovisioning/terms/TermsActivity.java
index 1f8b087..0c84567 100644
--- a/src/com/android/managedprovisioning/preprovisioning/terms/TermsActivity.java
+++ b/src/com/android/managedprovisioning/preprovisioning/terms/TermsActivity.java
@@ -20,7 +20,7 @@
 import static com.android.internal.util.Preconditions.checkNotNull;
 
 import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.util.ArraySet;
 import android.view.ContextMenu;
 import android.view.MenuItem;
diff --git a/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java b/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
index a2a5704..8637e6e 100644
--- a/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
@@ -33,7 +33,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
diff --git a/tests/instrumentation/src/com/android/managedprovisioning/testcommon/ActivityLifecycleWaiter.java b/tests/instrumentation/src/com/android/managedprovisioning/testcommon/ActivityLifecycleWaiter.java
index 772e6ad..0cd586a 100644
--- a/tests/instrumentation/src/com/android/managedprovisioning/testcommon/ActivityLifecycleWaiter.java
+++ b/tests/instrumentation/src/com/android/managedprovisioning/testcommon/ActivityLifecycleWaiter.java
@@ -16,7 +16,7 @@
 package com.android.managedprovisioning.testcommon;
 
 import android.app.Activity;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 import android.support.test.runner.lifecycle.ActivityLifecycleCallback;
 import android.support.test.runner.lifecycle.ActivityLifecycleMonitor;
 import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 2531457..ff12765 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -8,7 +8,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.6.1-prebuilt \
+    platform-robolectric-3.6.2-prebuilt \
     telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := ManagedProvisioning
@@ -32,4 +32,4 @@
 
 LOCAL_TEST_PACKAGE := ManagedProvisioning
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
\ No newline at end of file
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
\ No newline at end of file