Merge "Allow max 3 minutes before going into suspend-to-RAM" into rvc-qpr-dev
diff --git a/car-maps-placeholder/res/values-ar/strings.xml b/car-maps-placeholder/res/values-ar/strings.xml
index ccb8e52..8fa36a4 100644
--- a/car-maps-placeholder/res/values-ar/strings.xml
+++ b/car-maps-placeholder/res/values-ar/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"خرائط"</string>
+    <string name="app_name" msgid="6575346965016311017">"خرائط Google"</string>
     <string name="error_text" msgid="5575174711944349180">"لم يتم تثبيت تطبيقات خرائط. يُرجى التواصل مع الشركة المصنّعة للسيارة."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-ca/strings.xml b/car-maps-placeholder/res/values-ca/strings.xml
index cd33f37..b516190 100644
--- a/car-maps-placeholder/res/values-ca/strings.xml
+++ b/car-maps-placeholder/res/values-ca/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Mapes"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"No hi ha cap aplicació de mapes instal·lada. Contacta amb el fabricant del cotxe."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-de/strings.xml b/car-maps-placeholder/res/values-de/strings.xml
index eb1e434..f5eef72 100644
--- a/car-maps-placeholder/res/values-de/strings.xml
+++ b/car-maps-placeholder/res/values-de/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Karten"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Keine Karten-App installiert. Bitte wende dich an den Autohersteller."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-eu/strings.xml b/car-maps-placeholder/res/values-eu/strings.xml
index 2bccc99..1cfccd3 100644
--- a/car-maps-placeholder/res/values-eu/strings.xml
+++ b/car-maps-placeholder/res/values-eu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Mapak"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ez dago mapa-aplikaziorik instalatuta. Jarri autoaren fabrikatzailearekin harremanetan."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-fi/strings.xml b/car-maps-placeholder/res/values-fi/strings.xml
index b4ddba7..4ebe066 100644
--- a/car-maps-placeholder/res/values-fi/strings.xml
+++ b/car-maps-placeholder/res/values-fi/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Kartat"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Karttasovellusta ei ole asennettu. Ota yhteyttä auton valmistajaan."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-gl/strings.xml b/car-maps-placeholder/res/values-gl/strings.xml
index f0763de..3451202 100644
--- a/car-maps-placeholder/res/values-gl/strings.xml
+++ b/car-maps-placeholder/res/values-gl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Mapas"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Non se instalou a aplicación de mapas. Contacta co fabricante do coche."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-it/strings.xml b/car-maps-placeholder/res/values-it/strings.xml
index 539e817..141433e 100644
--- a/car-maps-placeholder/res/values-it/strings.xml
+++ b/car-maps-placeholder/res/values-it/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Mappe"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nessuna app di mappe installata. Contatta il produttore dell\'auto."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-lv/strings.xml b/car-maps-placeholder/res/values-lv/strings.xml
index 842e0f8..44ae610 100644
--- a/car-maps-placeholder/res/values-lv/strings.xml
+++ b/car-maps-placeholder/res/values-lv/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Kartes"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nav instalēta neviena karšu lietojumprogramma. Sazinieties ar automašīnas ražotāju."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-nb/strings.xml b/car-maps-placeholder/res/values-nb/strings.xml
index e081913..9b6cf65 100644
--- a/car-maps-placeholder/res/values-nb/strings.xml
+++ b/car-maps-placeholder/res/values-nb/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Kart"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ingen kartapper er installert. Kontakt bilprodusenten."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-sq/strings.xml b/car-maps-placeholder/res/values-sq/strings.xml
index c7f1b9d..6ff0a14 100644
--- a/car-maps-placeholder/res/values-sq/strings.xml
+++ b/car-maps-placeholder/res/values-sq/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Hartat"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nuk ka asnjë aplikacion të hartave të instaluar. Kontakto me prodhuesin e makinës."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-sv/strings.xml b/car-maps-placeholder/res/values-sv/strings.xml
index 5dc6bda..3b36f71 100644
--- a/car-maps-placeholder/res/values-sv/strings.xml
+++ b/car-maps-placeholder/res/values-sv/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"Kartor"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ingen kartapp har installerats. Kontakta bilens tillverkare."</string>
 </resources>
diff --git a/computepipe/tests/fuzz/Android.bp b/computepipe/tests/fuzz/Android.bp
index 6c54b64..ee95bb1 100644
--- a/computepipe/tests/fuzz/Android.bp
+++ b/computepipe/tests/fuzz/Android.bp
@@ -82,6 +82,21 @@
 }
 
 cc_fuzz {
+    name: "computepipe_pixel_stream_manager_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    srcs: [
+        "PixelStreamManagerFuzzer.cpp",
+    ],
+    shared_libs: [
+         "libprotobuf-cpp-full",
+    ],
+    static_libs: [
+        "libcomputepipeprotosfuzz",
+        "libprotobuf-mutator",
+    ],
+}
+
+cc_fuzz {
     name: "local_prebuild_graph_fuzzer",
     defaults: ["libcomputepipefuzz-defaults"],
     cppflags:[
diff --git a/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp b/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp
new file mode 100644
index 0000000..1a8c83e
--- /dev/null
+++ b/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <vndk/hardware_buffer.h>
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include "EventGenerator.h"
+#include "InputFrame.h"
+#include "MockEngine.h"
+#include "OutputConfig.pb.h"
+#include "PixelFormatUtils.h"
+#include "PixelStreamManager.h"
+#include "RunnerComponent.h"
+#include "StreamEngineInterface.h"
+#include "StreamManager.h"
+#include "src/libfuzzer/libfuzzer_macro.h"
+#include "types/Status.h"
+
+using ::android::automotive::computepipe::runner::generator::DefaultEvent;
+using ::testing::Return;
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace runner {
+namespace stream_manager {
+namespace {
+
+enum State {
+    RESET = 0,
+    RUN,
+    STOP_WITH_FLUSH,
+    STOP_IMMEDIATE,
+    QUEUE_PACKET,
+    FREE_PACKET,
+    CLONE_PACKET
+};
+
+std::pair<std::shared_ptr<MockEngine>, std::unique_ptr<StreamManager>> CreateStreamManagerAndEngine(
+        int maxInFlightPackets) {
+    StreamManagerFactory factory;
+    proto::OutputConfig outputConfig;
+    outputConfig.set_type(proto::PacketType::PIXEL_DATA);
+    outputConfig.set_stream_name("pixel_stream");
+    std::shared_ptr<MockEngine> mockEngine = std::make_shared<MockEngine>();
+    std::unique_ptr<StreamManager> manager =
+            factory.getStreamManager(outputConfig, mockEngine, maxInFlightPackets);
+
+    return std::pair(mockEngine, std::move(manager));
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    if (size < sizeof(uint32_t)) {
+        return 0;
+    }
+
+    FuzzedDataProvider fdp(data, size);
+    int maxInFlightPackets = fdp.ConsumeIntegral<uint32_t>();
+    auto [mockEngine, manager] = CreateStreamManagerAndEngine(maxInFlightPackets);
+    std::vector<uint8_t> pixelData(16 * 16 * 3, 100);
+    InputFrame frame(16, 16, PixelFormat::RGB, 16 * 3, &pixelData[0]);
+    std::shared_ptr<MemHandle> memHandle;
+    EXPECT_CALL((*mockEngine), dispatchPacket)
+            .Times(testing::AnyNumber())
+            .WillRepeatedly(
+                    testing::DoAll(testing::SaveArg<0>(&memHandle), (Return(Status::SUCCESS))));
+
+    while (fdp.remaining_bytes() > 0) {
+        uint8_t state = fdp.ConsumeIntegralInRange<uint8_t>(RESET, CLONE_PACKET);
+        DefaultEvent e = DefaultEvent::generateEntryEvent(static_cast<DefaultEvent::Phase>(state));
+
+        switch (state) {
+            case RESET:
+            case RUN: {
+                manager->handleExecutionPhase(e);
+                break;
+            }
+            case STOP_WITH_FLUSH: {
+                EXPECT_CALL((*mockEngine), notifyEndOfStream).Times(testing::AtMost(1));
+                manager->handleStopWithFlushPhase(e);
+                sleep(1);
+                break;
+            }
+            case STOP_IMMEDIATE: {
+                EXPECT_CALL((*mockEngine), notifyEndOfStream).Times(testing::AtMost(1));
+                manager->handleStopImmediatePhase(e);
+                sleep(1);
+                break;
+            }
+            case QUEUE_PACKET: {
+                manager->queuePacket(frame, rand());
+                sleep(1);
+                break;
+            }
+            case FREE_PACKET: {
+                if (memHandle != nullptr) {
+                    manager->freePacket(memHandle->getBufferId());
+                }
+                break;
+            }
+            case CLONE_PACKET: {
+                manager->clonePacket(memHandle);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+}  // namespace
+}  // namespace stream_manager
+}  // namespace runner
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/tests/CarDeveloperOptions/res/values-as/strings.xml b/tests/CarDeveloperOptions/res/values-as/strings.xml
index 4a45624..7e0103e 100644
--- a/tests/CarDeveloperOptions/res/values-as/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-as/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ক পাহৰিব বিচাৰেনে?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"এই <xliff:g id="NAME">^1</xliff:g>ত সঞ্চিত সকলো এপ্, ফট\' আৰু ডেটা চিৰদিনৰ কাৰণে হেৰুৱাব।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"এপ্"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ফট\'"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ভিডিঅ\'"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"অডিঅ’"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"কেশ্ব কৰা ডেটা"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bn/strings.xml b/tests/CarDeveloperOptions/res/values-bn/strings.xml
index e7fceec..a093e48 100644
--- a/tests/CarDeveloperOptions/res/values-bn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"অ্যাপ"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ছবি"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"অডিও"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"ক্যাশে করা ডেটা"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bs/strings.xml b/tests/CarDeveloperOptions/res/values-bs/strings.xml
index e8481d6..46210f5 100644
--- a/tests/CarDeveloperOptions/res/values-bs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/strings.xml
@@ -1407,7 +1407,7 @@
     <string name="sd_mount_summary" product="default" msgid="6849124618494311233"></string>
     <string name="sd_format" product="nosdcard" msgid="918370986254863144">"Izbriši USB pohranu"</string>
     <string name="sd_format" product="default" msgid="1346245995138883960">"Izbriši SD karticu"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Briše sve podatke na internoj USB pohrani, kao što su muzika i fotografije"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Briše sve podatke na unutrašnjoj USB pohrani, kao što su muzika i fotografije"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"Briše sve podatke na SD kartici, kao što su muzika i fotografije"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"Želite li zbrisati keširane podatke?"</string>
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"Ovo briše keširane podatke za sve aplikacije."</string>
@@ -1537,12 +1537,12 @@
     <string name="storage_wizard_migrate_v2_later" msgid="4909412563144649085">"Premjesti sadržaj kasnije"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="1796255772658203586">"Premještanje sadržaja…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="4662009769135525740">"Spora pohrana <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na pohrani <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti bržu pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na uređaju za pohranu <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti brži uređaj za pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite ovaj uređaj <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1686964124972424100">"Počni ispočetka"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="2320238517431613392">"Nastavi"</string>
-    <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"Sadržaj možete premjestiti na pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="678829432420351228">"Da premjestite sadržaj na pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="4133133596316768033">"Sadržaj je premješten na pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate ovom pohranom <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
+    <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"Sadržaj možete premjestiti na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="678829432420351228">"Da premjestite sadržaj na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
+    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="4133133596316768033">"Sadržaj je premješten na uređaj za pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate uređajem za pohranu <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
     <string name="battery_status_title" msgid="8731200319740671905">"Status baterije"</string>
     <string name="battery_level_title" msgid="5207775387973771646">"Nivo napunjenosti baterije"</string>
     <string name="apn_settings" msgid="8130776653826271664">"APN-ovi"</string>
@@ -1615,7 +1615,7 @@
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"Izbriši SD karticu"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Izbrišite sve podatke na internoj USB pohrani, poput muzike ili fotografija"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Izbrišite sve podatke na unutrašnjoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
     <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Izbriši sve podatke"</string>
     <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Izbriši sve podatke"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ca/arrays.xml b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
index 2ff467c..0b545ab 100644
--- a/tests/CarDeveloperOptions/res/values-ca/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
@@ -399,7 +399,7 @@
     <item msgid="3673930830658169860">"Personalitzat"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="6566768880689730097">"VPN de PPTP"</item>
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
     <item msgid="1349760781118368659">"VPN L2TP/IPSec amb claus prèviament compartides"</item>
     <item msgid="6128519070545038358">"VPN L2TP/IPSec amb certificats"</item>
     <item msgid="312397853907741968">"VPN IPSec amb claus prèviament compartides i autenticació Xauth"</item>
diff --git a/tests/CarDeveloperOptions/res/values-da/strings.xml b/tests/CarDeveloperOptions/res/values-da/strings.xml
index fa6457c..56eeb07 100644
--- a/tests/CarDeveloperOptions/res/values-da/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-da/strings.xml
@@ -2455,9 +2455,9 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Aktiveres ved <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Angiv en tidsplan"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Deaktiver, når enheden er opladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterisparefunktion slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Batterisparefunktion slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Batterisparefunktion slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterisparefunktionen slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Batterisparefunktionen slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Batterisparefunktionen slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"Aktivér"</string>
diff --git a/tests/CarDeveloperOptions/res/values-de/strings.xml b/tests/CarDeveloperOptions/res/values-de/strings.xml
index 704cc29..4a70fbf 100644
--- a/tests/CarDeveloperOptions/res/values-de/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-de/strings.xml
@@ -460,7 +460,7 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"Überspringen"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"Sensor berühren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Er befindet sich auf der Rückseite deines Smartphones. Verwende am besten den Zeigefinger."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Er befindet sich auf der Rückseite des Smartphones. Am besten den Zeigefinger verwenden."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="3519748398694308901">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="3428927518029038956">"Ok"</string>
@@ -548,7 +548,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="2429667472335773519">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="4739290104106645233">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="3911582328576859628">"Smartphone schützen"</string>
-    <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"Richte für zusätzliche Sicherheit eine alternative Displaysperre ein"</string>
+    <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"Alternative Displaysperre einrichten für zusätzliche Sicherheit"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
@@ -1712,7 +1712,7 @@
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="4921343500484160894">"Für Fingerabdruck Passwort festlegen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="314870151462139417">"Für Fingerabdruck Muster festlegen"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Richte zur Sicherheit eine PIN ein"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"Für Fingerabdruck PIN festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"PIN für Fingerabdruck festlegen"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"Richte zur Sicherheit ein Muster ein"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Passwort noch einmal eingeben"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"Muster bestätigen"</string>
diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index 165bf1b..68c4dc0 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -844,7 +844,7 @@
     <string name="wifi_starting" msgid="1299466156783469023">"Wi-Fi konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="413711069039939520">"Wi-Fia desaktibatzen…"</string>
     <string name="wifi_error" msgid="5605801874484465557">"Errorea"</string>
-    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz-ko banda ez dago erabilgarri herrialde honetan"</string>
+    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz-eko banda ez dago erabilgarri herrialde honetan"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"Hegaldi moduan"</string>
     <string name="wifi_notify_open_networks" msgid="4782239203624619655">"Sare irekien jakinarazpenak"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"Jakinarazi kalitate handiko sare publikoak erabilgarri daudenean"</string>
@@ -925,9 +925,9 @@
     <string name="wifi_show_password" msgid="7878398590772942202">"Erakutsi pasahitza"</string>
     <string name="wifi_ap_band_config" msgid="6565016368079288433">"Hautatu AP banda"</string>
     <string name="wifi_ap_choose_auto" msgid="7927637960569365785">"Automatikoa"</string>
-    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2,4 GHz-ko banda"</string>
-    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5,0 GHz-ko banda"</string>
-    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5,0 GHz-ko banda hobetsia"</string>
+    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2,4 GHz-eko banda"</string>
+    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5,0 GHz-eko banda"</string>
+    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5,0 GHz-eko banda hobetsia"</string>
     <string name="wifi_ap_2G" msgid="5793110086517338494">"2,4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4584892544393675403">"5,0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Aukeratu gutxienez banda bat wifi-gunerako:"</string>
diff --git a/tests/CarDeveloperOptions/res/values-gu/strings.xml b/tests/CarDeveloperOptions/res/values-gu/strings.xml
index 9231d59..4d71618 100644
--- a/tests/CarDeveloperOptions/res/values-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ભૂલી ગયાં?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ઍપ્લિકેશનો"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"છબીઓ"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"વિડિઓઝ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ઑડિઓ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"કેશ્ડ ડેટા"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hi/strings.xml b/tests/CarDeveloperOptions/res/values-hi/strings.xml
index 359b2b1..168d527 100644
--- a/tests/CarDeveloperOptions/res/values-hi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ऐप्लिकेशन"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"इमेज"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ऑडियो"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"संग्रहित डेटा"</string>
diff --git a/tests/CarDeveloperOptions/res/values-lv/strings.xml b/tests/CarDeveloperOptions/res/values-lv/strings.xml
index 95fecee..4b55e3a 100644
--- a/tests/CarDeveloperOptions/res/values-lv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/strings.xml
@@ -4367,12 +4367,12 @@
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"Lietojumprogramma, kam ANGLE ir iespējots: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="game_driver_dashboard_title" msgid="219443350404091201">"Game Driver preferences"</string>
     <string name="game_driver_dashboard_summary" msgid="1500674075618790528">"Mainīt Game Driver iestatījumus"</string>
-    <string name="game_driver_footer_text" msgid="1540158284161797913">"Kad lietotne Game Driver ir ieslēgta, varat izvēlēties izmantot atjaunināto grafikas dzini ierīcē instalētajām lietotnēm."</string>
+    <string name="game_driver_footer_text" msgid="1540158284161797913">"Kad lietotne Game Driver ir ieslēgta, varat izvēlēties izmantot atjaunināto grafikas draiveri ierīcē instalētajām lietotnēm."</string>
     <string name="game_driver_all_apps_preference_title" msgid="2453795714218707495">"Iespējot visām lietotnēm"</string>
-    <string name="game_driver_app_preference_title" msgid="7732401084883356004">"Grafikas dziņa atlase"</string>
+    <string name="game_driver_app_preference_title" msgid="7732401084883356004">"Grafikas draivera atlase"</string>
     <string name="game_driver_app_preference_default" msgid="7141877602592473729">"Noklusējums"</string>
     <string name="game_driver_app_preference_game_driver" msgid="879325851829463741">"Game Driver"</string>
-    <string name="game_driver_app_preference_system" msgid="2289297988130187480">"Sistēmas grafikas dzinis"</string>
+    <string name="game_driver_app_preference_system" msgid="2289297988130187480">"Sistēmas grafikas draiveris"</string>
     <!-- no translation found for game_driver_app_preference_values:0 (7987059854719029308) -->
     <!-- no translation found for game_driver_app_preference_values:1 (8222525327130471766) -->
     <!-- no translation found for game_driver_app_preference_values:2 (2739878257804927321) -->
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
index d7af2e2..78d9787 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko WiFi-a. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
index 54222b5..8410425 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે ઇમર્જન્સી કૉલ કરી શકતા નથી. જો તમે કોઈ ઇમર્જન્સી કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ડિવાઇસ ઑટોમૅટિક રીતે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ ઇમર્જન્સી કૉલ કરી શકાય છે."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
index 51ca01e..48022a0 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपतकालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपतकालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्ने छ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपतकालीन कलहरू गर्न सकिन्छ।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपत्‌कालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपत्‌कालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्ने छ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपत्‌कालीन कलहरू गर्न सकिन्छ।"</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
index e1618bd..65c98f9 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко Wi-Fi-ја. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко WiFi-а. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-ml/strings.xml b/tests/CarDeveloperOptions/res/values-ml/strings.xml
index ff08a58..a687089 100644
--- a/tests/CarDeveloperOptions/res/values-ml/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> മറക്കണോ?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> എന്നതിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ആപ്സും ഫോട്ടോകളും ഡാറ്റയും ശാശ്വതമായി നഷ്ടപ്പെടും."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ആപ്സ്"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ചിത്രങ്ങൾ"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"വീഡിയോകൾ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ഓഡിയോ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"കാഷെ ചെയ്‌ത ഡാറ്റ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-nl/strings.xml b/tests/CarDeveloperOptions/res/values-nl/strings.xml
index 8a58f5d..256c6fd 100644
--- a/tests/CarDeveloperOptions/res/values-nl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/strings.xml
@@ -4065,7 +4065,7 @@
     <string name="notification_suggestion_title" msgid="3292107671498148560">"Informatie op vergrendelscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="6516827892359614597">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="4824744863994538006">"Alle"</string>
-    <string name="page_tab_title_support" msgid="5569262185010367870">"Tips en ondersteuning"</string>
+    <string name="page_tab_title_support" msgid="5569262185010367870">"Tips en support"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="940723020871007898">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
diff --git a/tests/CarDeveloperOptions/res/values-or/strings.xml b/tests/CarDeveloperOptions/res/values-or/strings.xml
index 2375f44..d4465c9 100644
--- a/tests/CarDeveloperOptions/res/values-or/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-or/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> କୁ ଭୁଲିଯିବେ?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ଏହି <xliff:g id="NAME">^1</xliff:g> ରେ ଷ୍ଟୋର୍‌ ହୋଇଥିବା ସମସ୍ତ ଆପସ, ଫଟୋଗୁଡିକ, ତଥା ଡାଟା ସବୁ ସମୟ ପାଇଁ ବାହାରିଯିବ।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ଆପ୍‌‍"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ଇମେଜ୍‌"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ଭିଡିଓ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ଅଡିଓ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"କ୍ୟାଶ୍‍ ହୋଇଥିବା ଡାଟା"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ta/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index 6a8ec12..e8c26e7 100644
--- a/tests/CarDeveloperOptions/res/values-ta/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து ஆப்ஸ், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ஆப்ஸ்"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"படங்கள்"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"வீடியோக்கள்"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"தற்காலிகத் தரவு"</string>
diff --git a/tests/CarDeveloperOptions/res/values-te/strings.xml b/tests/CarDeveloperOptions/res/values-te/strings.xml
index 78f71a2..2fd95eb 100644
--- a/tests/CarDeveloperOptions/res/values-te/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-te/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ని విస్మరించాలా?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ఈ <xliff:g id="NAME">^1</xliff:g>లో నిల్వ చేయబడిన అన్ని అనువర్తనాలు, ఫోటోలు మరియు డేటాను శాశ్వతంగా కోల్పోతారు."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"యాప్‌లు"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"చిత్రాలు"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"ఇమేజ్‌లు"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"వీడియోలు"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ఆడియో"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"కాష్ చేసిన డేటా"</string>
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
index fcc9ff5..8913f2a 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
@@ -22,7 +22,7 @@
     <string name="couldnt_launch" msgid="7815676424138012351">"تعذَّر تشغيل النشاط."</string>
     <string name="select_display" msgid="1682700853391296117">"اختَر شاشة."</string>
     <string name="add_app_shortcut" msgid="8873512136913188432">"إضافة اختصار التطبيق"</string>
-    <string name="set_wallpaper" msgid="3650915172749345197">"تحديد الخلفية"</string>
+    <string name="set_wallpaper" msgid="3650915172749345197">"ضبط الخلفية"</string>
     <string name="new_instance" msgid="1924479866055190730">"طلب التشغيل في مثيل جديد"</string>
     <string name="wallpaper_description" msgid="5885164573334720996">"نموذج خلفية الشاشة المتعددة"</string>
 </resources>