Merge "Split ClusterHomeCallback into ClusterStateListener and ClusterNavigationStateListener. - This is done because ClusterHomeCallback was catering to 2 use cases. - Splitted the registerCallback and unregisterCallback methods as well." into sc-v2-dev
diff --git a/car-admin-ui-lib/Android.bp b/car-admin-ui-lib/Android.bp
index 35a8fda..96615fa 100644
--- a/car-admin-ui-lib/Android.bp
+++ b/car-admin-ui-lib/Android.bp
@@ -28,7 +28,8 @@
         "src/**/*.java",
     ],
     libs: [
-        "SettingsLib"
+        "SettingsLib",
+        "modules-utils-preconditions",
     ],
     resource_dirs: [
         "src/main/res"
diff --git a/car-admin-ui-lib/src/main/java/com/android/car/admin/ui/UserAvatarView.java b/car-admin-ui-lib/src/main/java/com/android/car/admin/ui/UserAvatarView.java
index e4d2a15..3b92265 100644
--- a/car-admin-ui-lib/src/main/java/com/android/car/admin/ui/UserAvatarView.java
+++ b/car-admin-ui-lib/src/main/java/com/android/car/admin/ui/UserAvatarView.java
@@ -24,6 +24,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.android.internal.util.Preconditions;
 import com.android.settingslib.drawable.UserIconDrawable;
 
 // TODO(b/176262528): copied from com.android.systemui, ideally it should be provided by a common
@@ -121,21 +122,26 @@
     }
 
     public void setDrawable(Drawable d) {
-        if (d instanceof UserIconDrawable) {
-            throw new RuntimeException("Recursively adding UserIconDrawable");
-        }
+        Preconditions.checkArgument(!(d instanceof UserIconDrawable),
+                "Recursively adding UserIconDrawable: %s", d);
         mDrawable.setIconDrawable(d);
         mDrawable.setBadge(null);
     }
 
     public void setDrawableWithBadge(Drawable d, int userId) {
-        if (d instanceof UserIconDrawable) {
-            throw new RuntimeException("Recursively adding UserIconDrawable");
-        }
+        Preconditions.checkArgument(!(d instanceof UserIconDrawable),
+                "Recursively adding UserIconDrawable: %s", d);
         mDrawable.setIconDrawable(d);
         mDrawable.setBadgeIfManagedUser(getContext(), userId);
     }
 
+    public void setDrawableWithBadge(Drawable d) {
+        Preconditions.checkArgument(!(d instanceof UserIconDrawable),
+                "Recursively adding UserIconDrawable: %s", d);
+        mDrawable.setIconDrawable(d);
+        mDrawable.setBadgeIfManagedDevice(getContext());
+    }
+
     public UserIconDrawable getUserIconDrawable() {
         return mDrawable;
     }
diff --git a/car_product/car_ui_portrait/rro/CarUiPortraitLauncherRRO/res/values/config.xml b/car_product/car_ui_portrait/rro/CarUiPortraitLauncherRRO/res/values/config.xml
index fa5b133..72d87d8 100644
--- a/car_product/car_ui_portrait/rro/CarUiPortraitLauncherRRO/res/values/config.xml
+++ b/car_product/car_ui_portrait/rro/CarUiPortraitLauncherRRO/res/values/config.xml
@@ -42,6 +42,6 @@
     <!-- The ComponentName of Assistant VoicePlate Activity, the Activity will be placed in
         VoicePlate TDA -->
     <string name="config_assistantVoicePlateActivity" translatable="false">
-        com.google.android.carassistant/com.google.android.apps.gsa.binaries.auto.app.voiceplate.VoicePlateActivity
+        com.google.android.carassistant/com.google.android.libraries.assistant.auto.tng.assistant.ui.activity.AutoAssistantActivity
     </string>
 </resources>
diff --git a/cpp/evs/manager/1.1/Enumerator.cpp b/cpp/evs/manager/1.1/Enumerator.cpp
index d6f532d..b33ddac 100644
--- a/cpp/evs/manager/1.1/Enumerator.cpp
+++ b/cpp/evs/manager/1.1/Enumerator.cpp
@@ -79,7 +79,7 @@
 
     // Connect with the underlying hardware enumerator
     mHwEnumerator = IEvsEnumerator::getService(hardwareServiceName);
-    bool result = (mHwEnumerator.get() != nullptr);
+    bool result = (mHwEnumerator != nullptr);
     if (result) {
         // Get an internal display identifier.
         mHwEnumerator->getDisplayIdList(
@@ -296,7 +296,7 @@
 Return<void> Enumerator::closeCamera(const ::android::sp<IEvsCamera_1_0>& clientCamera) {
     LOG(DEBUG) << __FUNCTION__;
 
-    if (clientCamera.get() == nullptr) {
+    if (clientCamera == nullptr) {
         LOG(ERROR) << "Ignoring call with null camera pointer.";
         return Void();
     }
@@ -317,6 +317,7 @@
             // NOTE:  This should drop our last reference to the camera, resulting in its
             //        destruction.
             mActiveCameras.erase(halCamera->getId());
+            mHwEnumerator->closeCamera(halCamera->getHwCamera());
             if (mMonitorEnabled) {
                 mClientsMonitor->unregisterClientToMonitor(halCamera->getId());
             }
@@ -358,8 +359,7 @@
                                                        mEmulatedCameraDevices[id]);
                 }
             } else {
-                device = IEvsCamera_1_1::castFrom(mHwEnumerator->openCamera_1_1(id, streamCfg))
-                         .withDefault(nullptr);
+                device = mHwEnumerator->openCamera_1_1(id, streamCfg);
             }
 
             if (device == nullptr) {
diff --git a/cpp/evs/manager/1.1/HalCamera.cpp b/cpp/evs/manager/1.1/HalCamera.cpp
index e527840..47cad2d 100644
--- a/cpp/evs/manager/1.1/HalCamera.cpp
+++ b/cpp/evs/manager/1.1/HalCamera.cpp
@@ -63,7 +63,7 @@
 }
 
 
-bool HalCamera::ownVirtualCamera(sp<VirtualCamera> virtualCamera) {
+bool HalCamera::ownVirtualCamera(sp<VirtualCamera>& virtualCamera) {
 
     if (virtualCamera == nullptr) {
         LOG(ERROR) << "Failed to create virtualCamera camera object";
@@ -86,20 +86,45 @@
     return true;
 }
 
-
-void HalCamera::disownVirtualCamera(sp<VirtualCamera> virtualCamera) {
+void HalCamera::disownVirtualCamera(sp<VirtualCamera>& virtualCamera) {
     // Ignore calls with null pointers
-    if (virtualCamera.get() == nullptr) {
+    if (virtualCamera == nullptr) {
         LOG(WARNING) << "Ignoring disownVirtualCamera call with null pointer";
         return;
     }
 
     // Remove the virtual camera from our client list
-    unsigned clientCount = mClients.size();
+    const auto clientCount = mClients.size();
     mClients.remove(virtualCamera);
     if (clientCount != mClients.size() + 1) {
-        LOG(ERROR) << "Couldn't find camera in our client list to remove it; "
-                   << "this client may be removed already.";
+        LOG(WARNING) << "Couldn't find camera in our client list to remove it; "
+                     << "this client may be removed already.";
+    }
+
+    // Recompute the number of buffers required with the target camera removed from the list
+    if (!changeFramesInFlight(0)) {
+        LOG(ERROR) << "Error when trying to reduce the in flight buffer count";
+    }
+
+    // Update statistics
+    mUsageStats->updateNumClients(mClients.size());
+}
+
+void HalCamera::disownVirtualCamera(const VirtualCamera* clientToDisown) {
+    // Ignore calls with null pointers
+    if (clientToDisown == nullptr) {
+        LOG(WARNING) << "Ignoring disownVirtualCamera call with null pointer";
+        return;
+    }
+
+    // Remove the virtual camera from our client list
+    const auto clientCount = mClients.size();
+    mClients.remove_if([&clientToDisown](wp<VirtualCamera>& client) {
+                           return client == clientToDisown;
+                       });
+    if (clientCount == mClients.size()) {
+        LOG(WARNING) << "Couldn't find camera in our client list to remove it; "
+                     << "this client may be removed already.";
     }
 
     // Recompute the number of buffers required with the target camera removed from the list
diff --git a/cpp/evs/manager/1.1/HalCamera.h b/cpp/evs/manager/1.1/HalCamera.h
index 1b05443..a63684a 100644
--- a/cpp/evs/manager/1.1/HalCamera.h
+++ b/cpp/evs/manager/1.1/HalCamera.h
@@ -58,7 +58,7 @@
 // stream from the hardware camera and distribute it to the associated VirtualCamera objects.
 class HalCamera : public IEvsCameraStream_1_1 {
 public:
-    HalCamera(sp<IEvsCamera_1_1> hwCamera,
+    HalCamera(sp<IEvsCamera_1_1>& hwCamera,
               std::string deviceId = "",
               int32_t recordId = 0,
               Stream cfg = {})
@@ -75,8 +75,9 @@
 
     // Factory methods for client VirtualCameras
     sp<VirtualCamera>     makeVirtualCamera();
-    bool                  ownVirtualCamera(sp<VirtualCamera> virtualCamera);
-    void                  disownVirtualCamera(sp<VirtualCamera> virtualCamera);
+    bool                  ownVirtualCamera(sp<VirtualCamera>& virtualCamera);
+    void                  disownVirtualCamera(sp<VirtualCamera>& virtualCamera);
+    void                  disownVirtualCamera(const VirtualCamera* virtualCamera);
 
     // Implementation details
     sp<IEvsCamera_1_0>  getHwCamera()       { return mHwCamera; };
diff --git a/cpp/evs/manager/1.1/VirtualCamera.cpp b/cpp/evs/manager/1.1/VirtualCamera.cpp
index 3b0ef95..2d416d2 100644
--- a/cpp/evs/manager/1.1/VirtualCamera.cpp
+++ b/cpp/evs/manager/1.1/VirtualCamera.cpp
@@ -86,6 +86,9 @@
 
             // Give the underlying hardware camera the heads up that it might be time to stop
             pHwCamera->clientStreamEnding(this);
+
+            // Retire from the participating HW camera's client list
+            pHwCamera->disownVirtualCamera(this);
         }
 
         // Join a capture thread
@@ -385,7 +388,6 @@
                     // This happens when either a new frame does not arrive
                     // before a timer expires or we're requested to stop
                     // capturing frames.
-                    LOG(DEBUG) << "Exiting a capture thread.";
                     break;
                 } else if (mStreamState == RUNNING) {
                     // Fetch frames and forward to the client
@@ -681,7 +683,7 @@
         return EvsResult::INVALID_ARG;
     }
 
-    if (display.get() == nullptr) {
+    if (display == nullptr) {
         LOG(ERROR) << __FUNCTION__
                    << ": Passed display is invalid";
         return EvsResult::INVALID_ARG;
diff --git a/cpp/evs/sampleDriver/EvsV4lCamera.cpp b/cpp/evs/sampleDriver/EvsV4lCamera.cpp
index db6e4ee..8fb4882 100644
--- a/cpp/evs/sampleDriver/EvsV4lCamera.cpp
+++ b/cpp/evs/sampleDriver/EvsV4lCamera.cpp
@@ -28,13 +28,10 @@
 #include <ui/GraphicBufferMapper.h>
 #include <utils/SystemClock.h>
 
+namespace {
 
-namespace android {
-namespace hardware {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
+// The size of a pixel of RGBA format data in bytes
+constexpr auto kBytesPerPixelRGBA = 4;
 
 // Default camera output image resolution
 const std::array<int32_t, 2> kDefaultResolution = {640, 480};
@@ -43,6 +40,16 @@
 // Safeguards against unreasonable resource consumption and provides a testable limit
 static const unsigned MAX_BUFFERS_IN_FLIGHT = 100;
 
+}; // anonymous namespace
+
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
 EvsV4lCamera::EvsV4lCamera(const char *deviceName,
                            unique_ptr<ConfigManager::CameraInfo> &camInfo) :
         mFramesAllowed(0),
@@ -739,7 +746,7 @@
         android::base::unique_fd fd(open(filename.c_str(),
                                          O_WRONLY | O_CREAT,
                                          S_IRUSR | S_IWUSR | S_IRGRP));
-        LOG(ERROR) << filename << ", " << fd;
+        LOG(INFO) << filename << ", " << fd;
         if (fd == -1) {
             PLOG(ERROR) << "Failed to open a file, " << filename;
         } else {
@@ -775,6 +782,11 @@
         bufDesc_1_1.timestamp =
             pV4lBuff->timestamp.tv_sec * 1e+6 + pV4lBuff->timestamp.tv_usec;
 
+        const auto sizeInRGBA = pDesc->width * pDesc->height * kBytesPerPixelRGBA;
+        if (mColorSpaceConversionBuffer.size() < sizeInRGBA) {
+            mColorSpaceConversionBuffer.resize(sizeInRGBA);
+        }
+
         // Lock our output buffer for writing
         // TODO(b/145459970): Sometimes, physical camera device maps a buffer
         // into the address that is about to be unmapped by another device; this
@@ -799,7 +811,8 @@
 
         // Transfer the video image into the output buffer, making any needed
         // format conversion along the way
-        mFillBufferFromVideo(bufDesc_1_1, (uint8_t *)targetPixels, pData, mVideo.getStride());
+        mFillBufferFromVideo(bufDesc_1_1, (uint8_t *)targetPixels, pData,
+                             mColorSpaceConversionBuffer.data(), mStride);
 
         // Unlock the output buffer
         mapper.unlock(bufDesc_1_1.buffer.nativeHandle);
diff --git a/cpp/evs/sampleDriver/EvsV4lCamera.h b/cpp/evs/sampleDriver/EvsV4lCamera.h
index 4aa8bc7..28bd7b8 100644
--- a/cpp/evs/sampleDriver/EvsV4lCamera.h
+++ b/cpp/evs/sampleDriver/EvsV4lCamera.h
@@ -143,7 +143,7 @@
 
     // Which format specific function we need to use to move camera imagery into our output buffers
     void(*mFillBufferFromVideo)(const BufferDesc& tgtBuff, uint8_t* tgt,
-                                void* imgData, unsigned imgStride);
+                                void* imgData, void* buf, unsigned imgStride);
 
 
     EvsResult doneWithFrame_impl(const uint32_t id, const buffer_handle_t handle);
@@ -166,6 +166,9 @@
 
     // Frame counter
     uint64_t mFrameCounter = 0;
+
+    // A buffer to hold an intermediate color conversion data
+    std::vector<uint8_t> mColorSpaceConversionBuffer;
 };
 
 } // namespace implementation
diff --git a/cpp/evs/sampleDriver/bufferCopy.cpp b/cpp/evs/sampleDriver/bufferCopy.cpp
index 098af61..253e39d 100644
--- a/cpp/evs/sampleDriver/bufferCopy.cpp
+++ b/cpp/evs/sampleDriver/bufferCopy.cpp
@@ -19,6 +19,14 @@
 #include <android-base/logging.h>
 #include <libyuv.h>
 
+namespace {
+
+inline constexpr size_t kYuv422BytesPerPixel = 2;
+inline constexpr size_t kRgbaBytesPerPixel = 4;
+
+}; // anonymous namespace
+
+
 namespace android {
 namespace hardware {
 namespace automotive {
@@ -38,7 +46,8 @@
 }
 
 
-void fillNV21FromNV21(const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, unsigned) {
+void fillNV21FromNV21(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void*, unsigned) {
     // The NV21 format provides a Y array of 8bit values, followed by a 1/2 x 1/2 interleave U/V array.
     // It assumes an even width and height for the overall image, and a horizontal stride that is
     // an even multiple of 16 bytes for both the Y and UV arrays.
@@ -57,7 +66,8 @@
 }
 
 
-void fillNV21FromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, unsigned imgStride) {
+void fillNV21FromYUYV(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void*, unsigned imgStride) {
     // The YUYV format provides an interleaved array of pixel values with U and V subsampled in
     // the horizontal direction only.  Also known as interleaved 422 format.  A 4 byte
     // "macro pixel" provides the Y value for two adjacent pixels and the U and V values shared
@@ -120,15 +130,17 @@
 }
 
 
-void fillRGBAFromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, unsigned imgStride) {
+void fillRGBAFromYUYV(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void* buf, unsigned imgStride) {
     const AHardwareBuffer_Desc* pDesc =
         reinterpret_cast<const AHardwareBuffer_Desc*>(&tgtBuff.buffer.description);
     // Converts YUY2ToARGB (little endian).  Please note that libyuv uses the
     // little endian while we're using the big endian in RGB format names.
-    const auto dstStrideInBytes = pDesc->stride * 4;  // 4-byte per pixel
+    const auto srcStrideInBytes = imgStride * kYuv422BytesPerPixel;
+    const auto dstStrideInBytes = pDesc->stride * kRgbaBytesPerPixel;
     auto result = libyuv::YUY2ToARGB((const uint8_t*)imgData,
-                                     imgStride,             // input stride in bytes
-                                     tgt,
+                                     srcStrideInBytes,      // input stride in bytes
+                                     (uint8_t*)buf,
                                      dstStrideInBytes,      // output stride in bytes
                                      pDesc->width,
                                      pDesc->height);
@@ -137,10 +149,8 @@
         return;
     }
 
-    // Swaps R and B pixels to convert BGRA to RGBA in place.
-    // TODO(b/190783702): Consider allocating an extra space to store ARGB data
-    //                    temporarily if below operation is too slow.
-    result = libyuv::ABGRToARGB(tgt, dstStrideInBytes, tgt, dstStrideInBytes,
+    // Swaps R and B pixels to convert BGRA to RGBA
+    result = libyuv::ABGRToARGB((uint8_t*)buf, dstStrideInBytes, tgt, dstStrideInBytes,
                                 pDesc->width, pDesc->height);
     if (result) {
         LOG(ERROR) << "Failed to convert BGRA to RGBA.";
@@ -148,31 +158,60 @@
 }
 
 
-void fillYUYVFromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, unsigned imgStride) {
+void fillRGBAFromUYVY(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void* buf, unsigned imgStride) {
     const AHardwareBuffer_Desc* pDesc =
         reinterpret_cast<const AHardwareBuffer_Desc*>(&tgtBuff.buffer.description);
-    unsigned width = pDesc->width;
-    unsigned height = pDesc->height;
-    uint8_t* src = (uint8_t*)imgData;
-    uint8_t* dst = (uint8_t*)tgt;
-    unsigned srcStrideBytes = imgStride;
-    unsigned dstStrideBytes = pDesc->stride * 2;
+    // Converts UYVYToARGB (little endian).  Please note that libyuv uses the
+    // little endian while we're using the big endian in RGB format names.
+    const auto srcStrideInBytes = imgStride * kYuv422BytesPerPixel;
+    const auto dstStrideInBytes = pDesc->stride * kRgbaBytesPerPixel;
+    auto result = libyuv::UYVYToARGB(static_cast<const uint8_t*>(imgData),
+                                     srcStrideInBytes,      // input stride in bytes
+                                     static_cast<uint8_t*>(buf),
+                                     dstStrideInBytes,      // output stride in bytes
+                                     pDesc->width,
+                                     pDesc->height);
+    if (result) {
+        LOG(ERROR) << "Failed to convert UYVY to BGRA.";
+        return;
+    }
 
-    for (unsigned r=0; r<height; r++) {
-        // Copy a pixel row at a time (2 bytes per pixel, averaged over a YUYV macro pixel)
-        memcpy(dst+r*dstStrideBytes, src+r*srcStrideBytes, width*2);
+    // Swaps R and B pixels to convert BGRA to RGBA
+    result = libyuv::ABGRToARGB(static_cast<uint8_t*>(buf), dstStrideInBytes, tgt,
+                                dstStrideInBytes, pDesc->width, pDesc->height);
+    if (result) {
+        LOG(WARNING) << "Failed to convert BGRA to RGBA.";
     }
 }
 
 
-void fillYUYVFromUYVY(const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, unsigned imgStride) {
+void fillYUYVFromYUYV(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void *, unsigned imgStride) {
+    const AHardwareBuffer_Desc* pDesc =
+        reinterpret_cast<const AHardwareBuffer_Desc*>(&tgtBuff.buffer.description);
+    const auto height = pDesc->height;
+    uint8_t* src = (uint8_t*)imgData;
+    uint8_t* dst = (uint8_t*)tgt;
+    const auto srcStrideBytes = imgStride * kYuv422BytesPerPixel;
+    const auto dstStrideBytes = pDesc->stride * kYuv422BytesPerPixel;
+
+    for (unsigned r=0; r<height; r++) {
+        // Copy a pixel row at a time (2 bytes per pixel, averaged over a YUYV macro pixel)
+        memcpy(dst+r*dstStrideBytes, src+r*srcStrideBytes, srcStrideBytes);
+    }
+}
+
+
+void fillYUYVFromUYVY(
+        const BufferDesc& tgtBuff, uint8_t* tgt, void* imgData, void *, unsigned imgStride) {
     const AHardwareBuffer_Desc* pDesc =
         reinterpret_cast<const AHardwareBuffer_Desc*>(&tgtBuff.buffer.description);
     unsigned width = pDesc->width;
     unsigned height = pDesc->height;
     uint32_t* src = (uint32_t*)imgData;
     uint32_t* dst = (uint32_t*)tgt;
-    unsigned srcStridePixels = imgStride / 2;
+    unsigned srcStridePixels = imgStride;
     unsigned dstStridePixels = pDesc->stride;
 
     const int srcRowPadding32 = srcStridePixels/2 - width/2;  // 2 bytes per pixel, 4 bytes per word
diff --git a/cpp/evs/sampleDriver/bufferCopy.h b/cpp/evs/sampleDriver/bufferCopy.h
index b07a619..a6bb512 100644
--- a/cpp/evs/sampleDriver/bufferCopy.h
+++ b/cpp/evs/sampleDriver/bufferCopy.h
@@ -30,19 +30,22 @@
 
 
 void fillNV21FromNV21(const BufferDesc& tgtBuff, uint8_t* tgt,
-                      void* imgData, unsigned imgStride);
+                      void* imgData, void* buf, unsigned imgStride);
 
 void fillNV21FromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt,
-                      void* imgData, unsigned imgStride);
+                      void* imgData, void* buf, unsigned imgStride);
 
 void fillRGBAFromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt,
-                      void* imgData, unsigned imgStride);
+                      void* imgData, void* buf, unsigned imgStride);
+
+void fillRGBAFromUYVY(const BufferDesc& tgtBuff, uint8_t* tgt,
+                      void* imgData, void* buf, unsigned imgStride);
 
 void fillYUYVFromYUYV(const BufferDesc& tgtBuff, uint8_t* tgt,
-                      void* imgData, unsigned imgStride);
+                      void* imgData, void* buf, unsigned imgStride);
 
 void fillYUYVFromUYVY(const BufferDesc& tgtBuff, uint8_t* tgt,
-                      void* imgData, unsigned imgStride);
+                      void* imgData, void* buf, unsigned imgStride);
 
 } // namespace implementation
 } // namespace V1_1
diff --git a/cpp/watchdog/aidl/android/automotive/watchdog/internal/PackageIoOveruseStats.aidl b/cpp/watchdog/aidl/android/automotive/watchdog/internal/PackageIoOveruseStats.aidl
index 8f3a143..ac9e140 100644
--- a/cpp/watchdog/aidl/android/automotive/watchdog/internal/PackageIoOveruseStats.aidl
+++ b/cpp/watchdog/aidl/android/automotive/watchdog/internal/PackageIoOveruseStats.aidl
@@ -17,6 +17,7 @@
 package android.automotive.watchdog.internal;
 
 import android.automotive.watchdog.IoOveruseStats;
+import android.automotive.watchdog.PerStateBytes;
 
 /**
  * Structure that describes the I/O overuse stats for a package.
@@ -32,8 +33,13 @@
    */
   boolean shouldNotify;
 
-   /**
-    * I/O overuse stats for the package.
-    */
+  /**
+   * Written bytes that are forgiven as they are accounted towards overuse.
+   */
+  PerStateBytes forgivenWriteBytes;
+
+  /**
+   * I/O overuse stats for the package.
+   */
   IoOveruseStats ioOveruseStats;
 }
diff --git a/cpp/watchdog/server/src/IoOveruseMonitor.cpp b/cpp/watchdog/server/src/IoOveruseMonitor.cpp
index 9d40f8b..1164a2a 100644
--- a/cpp/watchdog/server/src/IoOveruseMonitor.cpp
+++ b/cpp/watchdog/server/src/IoOveruseMonitor.cpp
@@ -59,6 +59,8 @@
 using ::android::base::WriteStringToFd;
 using ::android::binder::Status;
 
+constexpr int64_t kMaxInt32 = std::numeric_limits<int32_t>::max();
+constexpr int64_t kMaxInt64 = std::numeric_limits<int64_t>::max();
 // Minimum written bytes to sync the stats with the Watchdog service.
 constexpr int64_t kMinSyncWrittenBytes = 100 * 1024;
 // Minimum percentage of threshold to warn killable applications.
@@ -80,10 +82,8 @@
 
 PerStateBytes sum(const PerStateBytes& lhs, const PerStateBytes& rhs) {
     const auto sum = [](const int64_t& l, const int64_t& r) -> int64_t {
-        return (std::numeric_limits<int64_t>::max() - l) > r ? (l + r)
-                                                             : std::numeric_limits<int64_t>::max();
+        return (kMaxInt64 - l) > r ? (l + r) : kMaxInt64;
     };
-
     PerStateBytes result;
     result.foregroundBytes = sum(lhs.foregroundBytes, rhs.foregroundBytes);
     result.backgroundBytes = sum(lhs.backgroundBytes, rhs.backgroundBytes);
@@ -116,13 +116,39 @@
 
 int64_t totalPerStateBytes(PerStateBytes perStateBytes) {
     const auto sum = [](const int64_t& l, const int64_t& r) -> int64_t {
-        return std::numeric_limits<int64_t>::max() - l > r ? (l + r)
-                                                           : std::numeric_limits<int64_t>::max();
+        return kMaxInt64 - l > r ? (l + r) : kMaxInt64;
     };
     return sum(perStateBytes.foregroundBytes,
                sum(perStateBytes.backgroundBytes, perStateBytes.garageModeBytes));
 }
 
+std::tuple<int32_t, PerStateBytes> calculateOveruseAndForgivenBytes(PerStateBytes writtenBytes,
+                                                                    PerStateBytes threshold) {
+    const auto div = [](const int64_t& l, const int64_t& r) -> int32_t {
+        return r > 0 ? (l / r) : 1;
+    };
+    const auto mul = [](const int32_t& l, const int32_t& r) -> int32_t {
+        if (l == 0 || r == 0) {
+            return 0;
+        }
+        return (kMaxInt32 / r) > l ? (l * r) : kMaxInt32;
+    };
+    const auto sum = [](const int32_t& l, const int32_t& r) -> int32_t {
+        return (kMaxInt32 - l) > r ? (l + r) : kMaxInt32;
+    };
+    int32_t foregroundOveruses = div(writtenBytes.foregroundBytes, threshold.foregroundBytes);
+    int32_t backgroundOveruses = div(writtenBytes.backgroundBytes, threshold.backgroundBytes);
+    int32_t garageModeOveruses = div(writtenBytes.garageModeBytes, threshold.garageModeBytes);
+    int32_t totalOveruses = sum(foregroundOveruses, sum(backgroundOveruses, garageModeOveruses));
+
+    PerStateBytes forgivenWriteBytes;
+    forgivenWriteBytes.foregroundBytes = mul(foregroundOveruses, threshold.foregroundBytes);
+    forgivenWriteBytes.backgroundBytes = mul(backgroundOveruses, threshold.backgroundBytes);
+    forgivenWriteBytes.garageModeBytes = mul(garageModeOveruses, threshold.garageModeBytes);
+
+    return std::make_tuple(totalOveruses, forgivenWriteBytes);
+}
+
 }  // namespace
 
 std::tuple<int64_t, int64_t> calculateStartAndDuration(const time_t& currentTime) {
@@ -251,15 +277,23 @@
 
         const auto threshold = mIoOveruseConfigs->fetchThreshold(dailyIoUsage->packageInfo);
 
+        const auto deltaWrittenBytes =
+                diff(dailyIoUsage->writtenBytes, dailyIoUsage->forgivenWriteBytes);
+        const auto [currentOveruses, forgivenWriteBytes] =
+                calculateOveruseAndForgivenBytes(deltaWrittenBytes, threshold);
+        dailyIoUsage->totalOveruses += currentOveruses;
+        dailyIoUsage->forgivenWriteBytes =
+                sum(dailyIoUsage->forgivenWriteBytes, forgivenWriteBytes);
+
         PackageIoOveruseStats stats;
         stats.uid = curUidStats.packageInfo.packageIdentifier.uid;
         stats.shouldNotify = false;
+        stats.forgivenWriteBytes = dailyIoUsage->forgivenWriteBytes;
         stats.ioOveruseStats.startTime = startTime;
         stats.ioOveruseStats.durationInSeconds = durationInSeconds;
         stats.ioOveruseStats.writtenBytes = dailyIoUsage->writtenBytes;
         stats.ioOveruseStats.totalOveruses = dailyIoUsage->totalOveruses;
-        stats.ioOveruseStats.remainingWriteBytes =
-                diff(threshold, diff(dailyIoUsage->writtenBytes, dailyIoUsage->forgivenWriteBytes));
+        stats.ioOveruseStats.remainingWriteBytes = diff(threshold, deltaWrittenBytes);
         stats.ioOveruseStats.killableOnOveruse =
                 mIoOveruseConfigs->isSafeToKill(dailyIoUsage->packageInfo);
 
@@ -274,14 +308,7 @@
         bool shouldSyncWatchdogService =
                 (totalPerStateBytes(dailyIoUsage->writtenBytes) -
                  dailyIoUsage->lastSyncedWrittenBytes) >= mMinSyncWrittenBytes;
-        if (remainingWriteBytes.foregroundBytes == 0 || remainingWriteBytes.backgroundBytes == 0 ||
-            remainingWriteBytes.garageModeBytes == 0) {
-            stats.ioOveruseStats.totalOveruses = ++dailyIoUsage->totalOveruses;
-            /*
-             * Reset counters as the package may be disabled/killed by the watchdog service.
-             * NOTE: If this logic is updated, update watchdog service side logic as well.
-             */
-            dailyIoUsage->forgivenWriteBytes = dailyIoUsage->writtenBytes;
+        if (currentOveruses > 0) {
             dailyIoUsage->isPackageWarned = false;
             /*
              * Send notifications for native service I/O overuses as well because system listeners
diff --git a/cpp/watchdog/server/src/WatchdogProcessService.cpp b/cpp/watchdog/server/src/WatchdogProcessService.cpp
index fca1174..891c6e2 100644
--- a/cpp/watchdog/server/src/WatchdogProcessService.cpp
+++ b/cpp/watchdog/server/src/WatchdogProcessService.cpp
@@ -21,7 +21,6 @@
 
 #include "WatchdogServiceHelper.h"
 
-#include <android-base/chrono_utils.h>
 #include <android-base/file.h>
 #include <android-base/macros.h>
 #include <android-base/properties.h>
@@ -50,6 +49,7 @@
 using ::android::sp;
 using ::android::String16;
 using ::android::base::Error;
+using ::android::base::GetIntProperty;
 using ::android::base::GetProperty;
 using ::android::base::ReadFileToString;
 using ::android::base::Result;
@@ -83,12 +83,14 @@
 const int32_t MSG_VHAL_WATCHDOG_ALIVE = static_cast<int>(TimeoutLength::TIMEOUT_NORMAL) + 1;
 const int32_t MSG_VHAL_HEALTH_CHECK = MSG_VHAL_WATCHDOG_ALIVE + 1;
 
-// TODO(b/193742550): Restore the timeout to 3s after configuration by vendors is added.
-// VHAL sends heart beat every 6s. Car watchdog checks if there is the latest heart beat from VHAL
-// with 1s marginal time.
-constexpr std::chrono::milliseconds kVhalHeartBeatIntervalMs = 6s;
-constexpr std::chrono::nanoseconds kVhalHealthCheckDelayNs = kVhalHeartBeatIntervalMs + 1s;
+// VHAL is supposed to send heart beat every 3s. Car watchdog checks if there is the latest heart
+// beat from VHAL within 3s, allowing 1s marginal time.
+// If {@code ro.carwatchdog.vhal_healthcheck.interval} is set, car watchdog checks VHAL health at
+// the given interval. The lower bound of the interval is 3s.
+constexpr int32_t kDefaultVhalCheckIntervalSec = 3;
+constexpr std::chrono::milliseconds kHealthCheckDelayMs = 1s;
 
+constexpr const char kPropertyVhalCheckInterval[] = "ro.carwatchdog.vhal_healthcheck.interval";
 constexpr const char kServiceName[] = "WatchdogProcessService";
 constexpr const char kVhalInterfaceName[] = "android.hardware.automotive.vehicle@2.0::IVehicle";
 
@@ -140,6 +142,10 @@
         mClients.insert(std::make_pair(timeout, std::vector<ClientInfo>()));
         mPingedClients.insert(std::make_pair(timeout, PingedClientMap()));
     }
+    int32_t vhalHealthCheckIntervalSec =
+            GetIntProperty(kPropertyVhalCheckInterval, kDefaultVhalCheckIntervalSec);
+    vhalHealthCheckIntervalSec = std::max(vhalHealthCheckIntervalSec, kDefaultVhalCheckIntervalSec);
+    mVhalHealthCheckWindowMs = std::chrono::seconds(vhalHealthCheckIntervalSec);
 }
 Result<void> WatchdogProcessService::registerWatchdogServiceHelper(
         const sp<IWatchdogServiceHelper>& helper) {
@@ -339,6 +345,9 @@
         }
     }
     WriteStringToFd(StringPrintf("%sStopped users: %s\n", indent, buffer.c_str()), fd);
+    WriteStringToFd(StringPrintf("%sVHAL health check interval: %lldms\n", indent,
+                                 mVhalHealthCheckWindowMs.count()),
+                    fd);
     return {};
 }
 
@@ -764,7 +773,8 @@
         ALOGW("Failed to subscribe to VHAL_HEARTBEAT. Checking VHAL health is disabled.");
         return;
     }
-    mHandlerLooper->sendMessageDelayed(kVhalHealthCheckDelayNs.count(), mMessageHandler,
+    std::chrono::nanoseconds intervalNs = mVhalHealthCheckWindowMs + kHealthCheckDelayMs;
+    mHandlerLooper->sendMessageDelayed(intervalNs.count(), mMessageHandler,
                                        Message(MSG_VHAL_HEALTH_CHECK));
 }
 
@@ -789,7 +799,8 @@
         terminateVhal();
         return;
     }
-    mHandlerLooper->sendMessageDelayed(kVhalHealthCheckDelayNs.count(), mMessageHandler,
+    std::chrono::nanoseconds intervalNs = mVhalHealthCheckWindowMs + kHealthCheckDelayMs;
+    mHandlerLooper->sendMessageDelayed(intervalNs.count(), mMessageHandler,
                                        Message(MSG_VHAL_HEALTH_CHECK));
 }
 
@@ -800,7 +811,7 @@
         Mutex::Autolock lock(mMutex);
         lastEventTime = mVhalHeartBeat.eventTime;
     }
-    if (currentUptime > lastEventTime + kVhalHeartBeatIntervalMs.count()) {
+    if (currentUptime > lastEventTime + mVhalHealthCheckWindowMs.count()) {
         ALOGW("VHAL failed to update heart beat within timeout. Terminating VHAL...");
         terminateVhal();
     }
diff --git a/cpp/watchdog/server/src/WatchdogProcessService.h b/cpp/watchdog/server/src/WatchdogProcessService.h
index 7fab6cb..46d3ef4 100644
--- a/cpp/watchdog/server/src/WatchdogProcessService.h
+++ b/cpp/watchdog/server/src/WatchdogProcessService.h
@@ -17,6 +17,7 @@
 #ifndef CPP_WATCHDOG_SERVER_SRC_WATCHDOGPROCESSSERVICE_H_
 #define CPP_WATCHDOG_SERVER_SRC_WATCHDOGPROCESSSERVICE_H_
 
+#include <android-base/chrono_utils.h>
 #include <android-base/result.h>
 #include <android/automotive/watchdog/ICarWatchdogClient.h>
 #include <android/automotive/watchdog/internal/ICarWatchdogMonitor.h>
@@ -244,6 +245,7 @@
             mNotSupportedVhalProperties;
     android::sp<PropertyChangeListener> mPropertyChangeListener;
     HeartBeat mVhalHeartBeat GUARDED_BY(mMutex);
+    std::chrono::milliseconds mVhalHealthCheckWindowMs;
     android::sp<IWatchdogServiceHelper> mWatchdogServiceHelper GUARDED_BY(mMutex);
 };
 
diff --git a/cpp/watchdog/server/tests/IoOveruseMonitorTest.cpp b/cpp/watchdog/server/tests/IoOveruseMonitorTest.cpp
index f4dad98..c1dd4f7 100644
--- a/cpp/watchdog/server/tests/IoOveruseMonitorTest.cpp
+++ b/cpp/watchdog/server/tests/IoOveruseMonitorTest.cpp
@@ -111,11 +111,12 @@
 
 PackageIoOveruseStats constructPackageIoOveruseStats(
         const int32_t uid, const bool shouldNotify, const bool isKillable,
-        const PerStateBytes& remaining, const PerStateBytes& written, const int totalOveruses,
-        const int64_t startTime, const int64_t durationInSeconds) {
+        const PerStateBytes& remaining, const PerStateBytes& written, const PerStateBytes& forgiven,
+        const int totalOveruses, const int64_t startTime, const int64_t durationInSeconds) {
     PackageIoOveruseStats stats;
     stats.uid = uid;
     stats.shouldNotify = shouldNotify;
+    stats.forgivenWriteBytes = forgiven;
     stats.ioOveruseStats = constructIoOveruseStats(isKillable, remaining, written, totalOveruses,
                                                    startTime, durationInSeconds);
 
@@ -331,22 +332,25 @@
                                                              mMockUidStatsCollector, nullptr));
 
     std::vector<PackageIoOveruseStats> expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1001000, /*shouldNotify=*/false,
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/false,
                                             /*isKillable=*/false, /*remaining=*/
                                             constructPerStateBytes(10'000, 20'000, 100'000),
                                             /*written=*/constructPerStateBytes(70'000, 20'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1112345, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1112345, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(35'000, 15'000, 100'000),
                                             /*written=*/constructPerStateBytes(35'000, 15'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
              // Exceeds threshold.
-             constructPackageIoOveruseStats(/*uid*=*/1212345, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/true,
                                             /*isKillable=*/true,
                                             /*remaining=*/
                                             constructPerStateBytes(0, 10'000, 100'000),
                                             /*written=*/constructPerStateBytes(70'000, 20'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(70'000, 0, 0),
                                             /*totalOveruses=*/1, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
@@ -378,26 +382,29 @@
             << "\nActual: " << actualOverusingNativeStats.toString();
 
     expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1001000, /*shouldNotify=*/true,
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/true,
                                             /*isKillable=*/false, /*remaining=*/
                                             constructPerStateBytes(0, 20'000, 100'000),
                                             /*written=*/constructPerStateBytes(100'000, 20'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(80'000, 0, 0),
                                             /*totalOveruses=*/1, startTime, durationInSeconds),
              // Exceeds warn threshold percentage.
-             constructPackageIoOveruseStats(/*uid*=*/1113999, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1113999, /*shouldNotify=*/true,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(10'000, 5'000, 100'000),
                                             /*written=*/constructPerStateBytes(60'000, 25'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
              /*
               * Exceeds threshold.
               * The package was forgiven on previous overuse so the remaining bytes should only
               * reflect the bytes written after the forgiven bytes.
               */
-             constructPackageIoOveruseStats(/*uid*=*/1212345, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/true,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(50'000, 0, 100'000),
                                             /*written=*/constructPerStateBytes(90'000, 50'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(70'000, 30'000, 0),
                                             /*totalOveruses=*/2, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
@@ -422,20 +429,23 @@
 
     const auto [nextDayStartTime, nextDayDuration] = calculateStartAndDuration(currentTime);
     expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1001000, /*shouldNotify=*/false,
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/false,
                                             /*isKillable=*/false, /*remaining=*/
                                             constructPerStateBytes(2'000, 2'000, 100'000),
                                             /*written=*/constructPerStateBytes(78'000, 38'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, nextDayStartTime, nextDayDuration),
-             constructPackageIoOveruseStats(/*uid*=*/1113999, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1113999, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(15'000, 7'000, 100'000),
                                             /*written=*/constructPerStateBytes(55'000, 23'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, nextDayStartTime, nextDayDuration),
-             constructPackageIoOveruseStats(/*uid*=*/1212345, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(15'000, 7'000, 100'000),
                                             /*written=*/constructPerStateBytes(55'000, 23'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, nextDayStartTime,
                                             nextDayDuration)};
 
@@ -484,22 +494,25 @@
             << "\nActual: " << actualOverusingNativeStats.toString();
 
     const std::vector<PackageIoOveruseStats> expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1001000, /*shouldNotify=*/true,
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/true,
                                             /*isKillable=*/false, /*remaining=*/
                                             constructPerStateBytes(80'000, 40'000, 0),
                                             /*written=*/constructPerStateBytes(0, 0, 130'000),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 100'000),
                                             /*totalOveruses=*/1, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1112345, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1112345, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(70'000, 30'000, 50'000),
                                             /*written=*/constructPerStateBytes(0, 0, 50'000),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
              // Exceeds threshold.
-             constructPackageIoOveruseStats(/*uid*=*/1212345, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/true,
                                             /*isKillable=*/true,
                                             /*remaining=*/
                                             constructPerStateBytes(70'000, 30'000, 0),
                                             /*written=*/constructPerStateBytes(0, 0, 110'000),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 100'000),
                                             /*totalOveruses=*/1, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
@@ -524,6 +537,76 @@
                                                     mMockUidStatsCollector, nullptr));
 }
 
+TEST_F(IoOveruseMonitorTest, TestOnPeriodicCollectionWithExtremeOveruse) {
+    EXPECT_CALL(*mMockUidStatsCollector, deltaStats())
+            .WillOnce(Return(
+                    constructUidStats({{1001000, {/*fgWrBytes=*/190'000, /*bgWrBytes=*/42'000}},
+                                       {1212345, {/*fgWrBytes=*/90'000, /*bgWrBytes=*/90'000}}})));
+
+    time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+    const auto [startTime, durationInSeconds] = calculateStartAndDuration(currentTime);
+
+    std::vector<PackageIoOveruseStats> actualPackageIoOveruseStats;
+    EXPECT_CALL(*mMockWatchdogServiceHelper, latestIoOveruseStats(_))
+            .WillOnce(DoAll(SaveArg<0>(&actualPackageIoOveruseStats), Return(Status::ok())));
+
+    ASSERT_RESULT_OK(mIoOveruseMonitor->onPeriodicCollection(currentTime, SystemState::NORMAL_MODE,
+                                                             mMockUidStatsCollector, nullptr));
+
+    std::vector<PackageIoOveruseStats> expectedPackageIoOveruseStats =
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/true,
+                                            /*isKillable=*/false, /*remaining=*/
+                                            constructPerStateBytes(0, 0, 100'000),
+                                            /*written=*/constructPerStateBytes(190'000, 42'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(160'000, 40'000, 0),
+                                            /*totalOveruses=*/3, startTime, durationInSeconds),
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/true,
+                                            /*isKillable=*/true, /*remaining=*/
+                                            constructPerStateBytes(0, 0, 100'000),
+                                            /*written=*/constructPerStateBytes(90'000, 90'000, 0),
+                                            /*forgiven=*/constructPerStateBytes(70'000, 90'000, 0),
+                                            /*totalOveruses=*/4, startTime, durationInSeconds)};
+    EXPECT_THAT(actualPackageIoOveruseStats,
+                UnorderedElementsAreArray(expectedPackageIoOveruseStats))
+            << "Expected: " << toString(expectedPackageIoOveruseStats)
+            << "\nActual: " << toString(actualPackageIoOveruseStats);
+}
+
+TEST_F(IoOveruseMonitorTest, TestOnPeriodicCollectionWithExtremeOveruseInGarageMode) {
+    EXPECT_CALL(*mMockUidStatsCollector, deltaStats())
+            .WillOnce(Return(
+                    constructUidStats({{1001000, {/*fgWrBytes=*/190'000, /*bgWrBytes=*/42'000}},
+                                       {1212345, {/*fgWrBytes=*/90'000, /*bgWrBytes=*/90'000}}})));
+
+    time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+    const auto [startTime, durationInSeconds] = calculateStartAndDuration(currentTime);
+
+    std::vector<PackageIoOveruseStats> actualPackageIoOveruseStats;
+    EXPECT_CALL(*mMockWatchdogServiceHelper, latestIoOveruseStats(_))
+            .WillOnce(DoAll(SaveArg<0>(&actualPackageIoOveruseStats), Return(Status::ok())));
+
+    ASSERT_RESULT_OK(mIoOveruseMonitor->onPeriodicCollection(currentTime, SystemState::GARAGE_MODE,
+                                                             mMockUidStatsCollector, nullptr));
+
+    std::vector<PackageIoOveruseStats> expectedPackageIoOveruseStats =
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/true,
+                                            /*isKillable=*/false, /*remaining=*/
+                                            constructPerStateBytes(80'000, 40'000, 0),
+                                            /*written=*/constructPerStateBytes(0, 0, 232'000),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 200'000),
+                                            /*totalOveruses=*/2, startTime, durationInSeconds),
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/true,
+                                            /*isKillable=*/true, /*remaining=*/
+                                            constructPerStateBytes(70'000, 30'000, 0),
+                                            /*written=*/constructPerStateBytes(0, 0, 180'000),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 100'000),
+                                            /*totalOveruses=*/1, startTime, durationInSeconds)};
+    EXPECT_THAT(actualPackageIoOveruseStats,
+                UnorderedElementsAreArray(expectedPackageIoOveruseStats))
+            << "Expected: " << toString(expectedPackageIoOveruseStats)
+            << "\nActual: " << toString(actualPackageIoOveruseStats);
+}
+
 TEST_F(IoOveruseMonitorTest, TestOnPeriodicCollectionWithSmallWrittenBytes) {
     /*
      * UID 1212345 current written bytes < |KTestMinSyncWrittenBytes| so the UID's stats are not
@@ -547,21 +630,24 @@
                                                              mMockUidStatsCollector, nullptr));
 
     std::vector<PackageIoOveruseStats> expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1001000, /*shouldNotify=*/false,
+            {constructPackageIoOveruseStats(/*uid=*/1001000, /*shouldNotify=*/false,
                                             /*isKillable=*/false, /*remaining=*/
                                             constructPerStateBytes(20'800, 40'000, 100'000),
                                             /*written=*/
                                             constructPerStateBytes(59'200, 0, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1112345, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1112345, /*shouldNotify=*/true,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(70'000, 4'800, 100'000),
                                             /*written=*/constructPerStateBytes(0, 25'200, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1312345, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1312345, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(18'800, 30'000, 100'000),
                                             /*written=*/constructPerStateBytes(51'200, 0, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds)};
 
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
@@ -593,20 +679,24 @@
                                                              mMockUidStatsCollector, nullptr));
 
     expectedIoOveruseStats =
-            {constructPackageIoOveruseStats(/*uid*=*/1112345, /*shouldNotify=*/true,
+            {constructPackageIoOveruseStats(/*uid=*/1112345, /*shouldNotify=*/true,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(70'000, 0, 100'000),
                                             /*written=*/constructPerStateBytes(0, 30'100, 0),
+                                            /*forgiven=*/
+                                            constructPerStateBytes(0, 30'000, 0),
                                             /*totalOveruses=*/1, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1212345, /*shouldNotify=*/false,
+             constructPackageIoOveruseStats(/*uid=*/1212345, /*shouldNotify=*/false,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(65'000, 29'400, 100'000),
                                             /*written=*/constructPerStateBytes(5'000, 600, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds),
-             constructPackageIoOveruseStats(/*uid*=*/1312345, /*shouldNotify=*/true,
+             constructPackageIoOveruseStats(/*uid=*/1312345, /*shouldNotify=*/true,
                                             /*isKillable=*/true, /*remaining=*/
                                             constructPerStateBytes(13'900, 30'000, 100'000),
                                             /*written=*/constructPerStateBytes(56'100, 0, 0),
+                                            /*forgiven=*/constructPerStateBytes(0, 0, 0),
                                             /*totalOveruses=*/0, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
@@ -666,11 +756,13 @@
                      /*uid*=*/1001000, /*shouldNotify=*/false, /*isKillable=*/false,
                      /*remaining=*/constructPerStateBytes(10'000, 20'000, 100'000),
                      /*written=*/constructPerStateBytes(70'000, 20'000, 0),
+                     /*forgiven=*/constructPerStateBytes(0, 0, 0),
                      /*totalOveruses=*/0, startTime, durationInSeconds),
              constructPackageIoOveruseStats(
                      /*uid*=*/1112345, /*shouldNotify=*/true, /*isKillable=*/true,
                      /*remaining=*/constructPerStateBytes(5'000, 0, 80'000),
                      /*written=*/constructPerStateBytes(135'000, 100'000, 120'000),
+                     /*forgiven=*/constructPerStateBytes(70'000, 90'000, 100'000),
                      /*totalOveruses=*/4, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
@@ -690,14 +782,16 @@
 
     expectedIoOveruseStats = {constructPackageIoOveruseStats(
                                       /*uid*=*/1112345, /*shouldNotify=*/true, /*isKillable=*/true,
-                                      /*remaining=*/constructPerStateBytes(70'000, 30'000, 0),
+                                      /*remaining=*/constructPerStateBytes(5'000, 20'000, 0),
                                       /*written=*/constructPerStateBytes(135'000, 100'000, 230'000),
+                                      /*forgiven=*/constructPerStateBytes(70'000, 90'000, 200'000),
                                       /*totalOveruses=*/5, startTime, durationInSeconds),
                               constructPackageIoOveruseStats(
                                       /*uid*=*/1245678, /*shouldNotify=*/true, /*isKillable=*/true,
                                       /*remaining=*/constructPerStateBytes(10'000, 5'000, 0),
                                       /*written=*/constructPerStateBytes(50'000, 40'000, 75'000),
-                                      /*totalOveruses=*/7, startTime, durationInSeconds)};
+                                      /*forgiven=*/constructPerStateBytes(30'000, 30'000, 70'000),
+                                      /*totalOveruses=*/10, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
             << "\nActual: " << toString(actualIoOveruseStats);
@@ -740,7 +834,8 @@
             /*uid*=*/1112345, /*shouldNotify=*/true, /*isKillable=*/true,
             /*remaining=*/constructPerStateBytes(5'000, 0, 80'000),
             /*written=*/constructPerStateBytes(135'000, 140'000, 120'000),
-            /*totalOveruses=*/4, startTime, durationInSeconds)};
+            /*forgiven=*/constructPerStateBytes(70'000, 120'000, 100'000),
+            /*totalOveruses=*/5, startTime, durationInSeconds)};
     EXPECT_THAT(actualIoOveruseStats, UnorderedElementsAreArray(expectedIoOveruseStats))
             << "Expected: " << toString(expectedIoOveruseStats)
             << "\nActual: " << toString(actualIoOveruseStats);
@@ -878,7 +973,7 @@
     const auto expected =
             constructIoOveruseStats(/*isKillable=*/false,
                                     /*remaining=*/
-                                    constructPerStateBytes(80'000, 40'000, 100'000),
+                                    constructPerStateBytes(70'000, 20'000, 100'000),
                                     /*written=*/
                                     constructPerStateBytes(90'000, 20'000, 0),
                                     /*totalOveruses=*/1, startTime, durationInSeconds);
diff --git a/packages/CarDeveloperOptions/AndroidManifest.xml b/packages/CarDeveloperOptions/AndroidManifest.xml
index db784d2..0b82aea 100644
--- a/packages/CarDeveloperOptions/AndroidManifest.xml
+++ b/packages/CarDeveloperOptions/AndroidManifest.xml
@@ -160,6 +160,15 @@
         </activity>
 
         <activity
+            android:name="com.android.settings.Settings$WifiDetailsSettingsActivity"
+            android:enabled="false"
+            android:exported="false"
+            tools:node="merge"
+            tools:replace="android:exported">
+            <intent-filter tools:node="removeAll"/>
+        </activity>
+
+        <activity
             android:name="com.android.settings.Settings$ConfigureWifiSettingsActivity"
             android:enabled="false"
             android:exported="false"
@@ -737,6 +746,15 @@
         </activity>
 
         <activity
+            android:name="com.android.settings.Settings$WifiScanningSettingsActivity"
+            android:enabled="false"
+            android:exported="false"
+            tools:node="merge"
+            tools:replace="android:exported">
+            <intent-filter tools:node="removeAll"/>
+        </activity>
+
+        <activity
             android:name="com.android.settings.Settings$SecurityDashboardActivity"
             android:enabled="false"
             android:exported="false"
@@ -2333,6 +2351,15 @@
         </activity-alias>
 
         <activity-alias
+            android:name="com.android.settings.DeepLinkHomepageActivity"
+            android:enabled="false"
+            android:exported="false"
+            tools:node="merge"
+            tools:replace="android:exported">
+            <intent-filter tools:node="removeAll"/>
+        </activity-alias>
+
+        <activity-alias
             android:name="com.android.settings.Settings$BluetoothSettingsActivity"
             android:enabled="false"
             android:exported="false"
diff --git a/packages/ScriptExecutor/Android.bp b/packages/ScriptExecutor/Android.bp
index 643fb37..952a9b8 100644
--- a/packages/ScriptExecutor/Android.bp
+++ b/packages/ScriptExecutor/Android.bp
@@ -24,6 +24,7 @@
     ],
     header_libs: [
         "jni_headers",
+        "libnativehelper_header_only",
     ],
 
     static_libs: [
diff --git a/packages/ScriptExecutor/src/BundleWrapper.cpp b/packages/ScriptExecutor/src/BundleWrapper.cpp
index 36c9196..88403b0 100644
--- a/packages/ScriptExecutor/src/BundleWrapper.cpp
+++ b/packages/ScriptExecutor/src/BundleWrapper.cpp
@@ -16,6 +16,8 @@
 
 #include "BundleWrapper.h"
 
+#include "JniUtils.h"
+#include "nativehelper/scoped_local_ref.h"
 
 namespace com {
 namespace android {
@@ -25,31 +27,17 @@
 using ::android::base::Error;
 using ::android::base::Result;
 
-namespace {
-
-Result<jstring> TryCreateUTFString(JNIEnv* env, const char* string) {
-    jstring utfString = env->NewStringUTF(string);
-    if (env->ExceptionCheck()) {
-        // NewStringUTF throws an exception if we run out of memory while creating a UTF string.
-        return Error()
-                << "NewStringUTF ran out of memory while converting a string provided by Lua.";
-    }
-    if (utfString == nullptr) {
-        return Error()
-                << "Failed to convert a Lua string into a modified UTF-8 string. Please verify "
-                   "that the string returned by Lua is in proper Modified UTF-8 format.";
-    }
-    return utfString;
-}
-
-}  // namespace
-
 BundleWrapper::BundleWrapper(JNIEnv* env) {
     mJNIEnv = env;
-    mBundleClass = static_cast<jclass>(
-            mJNIEnv->NewGlobalRef(mJNIEnv->FindClass("android/os/PersistableBundle")));
+    ScopedLocalRef<jclass> localBundleClassRef(mJNIEnv,
+                                               mJNIEnv->FindClass("android/os/PersistableBundle"));
+    mBundleClass = static_cast<jclass>(mJNIEnv->NewGlobalRef(localBundleClassRef.get()));
+
     jmethodID bundleConstructor = mJNIEnv->GetMethodID(mBundleClass, "<init>", "()V");
-    mBundle = mJNIEnv->NewGlobalRef(mJNIEnv->NewObject(mBundleClass, bundleConstructor));
+    ScopedLocalRef<jobject> localBundleObjectRef(mJNIEnv,
+                                                 mJNIEnv->NewObject(mBundleClass,
+                                                                    bundleConstructor));
+    mBundle = mJNIEnv->NewGlobalRef(localBundleObjectRef.get());
 }
 
 BundleWrapper::~BundleWrapper() {
@@ -63,44 +51,40 @@
 }
 
 Result<void> BundleWrapper::putBoolean(const char* key, bool value) {
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
     // TODO(b/188832769): consider caching the references.
     jmethodID putBooleanMethod =
             mJNIEnv->GetMethodID(mBundleClass, "putBoolean", "(Ljava/lang/String;Z)V");
-    mJNIEnv->CallVoidMethod(mBundle, putBooleanMethod, keyStringResult.value(),
+    mJNIEnv->CallVoidMethod(mBundle, putBooleanMethod, keyStringRef.get(),
                             static_cast<jboolean>(value));
     return {};  // ok result
 }
 
 Result<void> BundleWrapper::putLong(const char* key, int64_t value) {
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
     jmethodID putLongMethod =
             mJNIEnv->GetMethodID(mBundleClass, "putLong", "(Ljava/lang/String;J)V");
-    mJNIEnv->CallVoidMethod(mBundle, putLongMethod, keyStringResult.value(),
-                            static_cast<jlong>(value));
+    mJNIEnv->CallVoidMethod(mBundle, putLongMethod, keyStringRef.get(), static_cast<jlong>(value));
     return {};  // ok result
 }
 
 Result<void> BundleWrapper::putDouble(const char* key, double value) {
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
     jmethodID putDoubleMethod =
             mJNIEnv->GetMethodID(mBundleClass, "putDouble", "(Ljava/lang/String;D)V");
-    mJNIEnv->CallVoidMethod(mBundle, putDoubleMethod, keyStringResult.value(),
+    mJNIEnv->CallVoidMethod(mBundle, putDoubleMethod, keyStringRef.get(),
                             static_cast<jdouble>(value));
     return {};  // ok result
 }
@@ -108,64 +92,59 @@
 Result<void> BundleWrapper::putString(const char* key, const char* value) {
     jmethodID putStringMethod = mJNIEnv->GetMethodID(mBundleClass, "putString",
                                                      "(Ljava/lang/String;Ljava/lang/String;)V");
-    // TODO(b/201008922): Handle a case when NewStringUTF returns nullptr (fails
-    // to create a string).
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
-    }
-    auto valueStringResult = TryCreateUTFString(mJNIEnv, value);
-    if (!valueStringResult.ok()) {
-        return Error() << "Failed to create a string for value=" << value << ". "
-                       << valueStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
-    mJNIEnv->CallVoidMethod(mBundle, putStringMethod, keyStringResult.value(),
-                            valueStringResult.value());
+    ScopedLocalRef<jstring> valueStringRef(mJNIEnv, mJNIEnv->NewStringUTF(value));
+    if (valueStringRef == nullptr) {
+        return Error() << "Failed to create a string for the provided value due to OOM error";
+    }
+
+    mJNIEnv->CallVoidMethod(mBundle, putStringMethod, keyStringRef.get(), valueStringRef.get());
     return {};  // ok result
 }
 
 Result<void> BundleWrapper::putLongArray(const char* key, const std::vector<int64_t>& value) {
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
     jmethodID putLongArrayMethod =
             mJNIEnv->GetMethodID(mBundleClass, "putLongArray", "(Ljava/lang/String;[J)V");
 
-    jlongArray array = mJNIEnv->NewLongArray(value.size());
-    mJNIEnv->SetLongArrayRegion(array, 0, value.size(), &value[0]);
-    mJNIEnv->CallVoidMethod(mBundle, putLongArrayMethod, keyStringResult.value(), array);
+    ScopedLocalRef<jlongArray> arrayRef(mJNIEnv, mJNIEnv->NewLongArray(value.size()));
+    mJNIEnv->SetLongArrayRegion(arrayRef.get(), 0, value.size(), &value[0]);
+    mJNIEnv->CallVoidMethod(mBundle, putLongArrayMethod, keyStringRef.get(), arrayRef.get());
     return {};  // ok result
 }
 
 Result<void> BundleWrapper::putStringArray(const char* key, const std::vector<std::string>& value) {
-    auto keyStringResult = TryCreateUTFString(mJNIEnv, key);
-    if (!keyStringResult.ok()) {
-        return Error() << "Failed to create a string for key=" << key << ". "
-                       << keyStringResult.error();
+    ScopedLocalRef<jstring> keyStringRef(mJNIEnv, mJNIEnv->NewStringUTF(key));
+    if (keyStringRef == nullptr) {
+        return Error() << "Failed to create a string for a key=" << key << " due to OOM error";
     }
 
     jmethodID putStringArrayMethod =
             mJNIEnv->GetMethodID(mBundleClass, "putStringArray",
                                  "(Ljava/lang/String;[Ljava/lang/String;)V");
 
-    jobjectArray array =
-            mJNIEnv->NewObjectArray(value.size(), mJNIEnv->FindClass("java/lang/String"), nullptr);
-    // TODO(b/201008922): Handle a case when NewStringUTF returns nullptr (fails
-    // to create a string).
+    ScopedLocalRef<jclass> stringClassRef(mJNIEnv, mJNIEnv->FindClass("java/lang/String"));
+    ScopedLocalRef<jobjectArray> arrayRef(mJNIEnv,
+                                          mJNIEnv->NewObjectArray(value.size(),
+                                                                  mJNIEnv->FindClass(
+                                                                          "java/lang/String"),
+                                                                  nullptr));
     for (int i = 0; i < value.size(); i++) {
-        auto valueStringResult = TryCreateUTFString(mJNIEnv, value[i].c_str());
-        if (!valueStringResult.ok()) {
-            return Error() << "Failed to create a string for value=" << value[i].c_str() << ". "
-                           << valueStringResult.error();
+        ScopedLocalRef<jstring> valueStringRef(mJNIEnv, mJNIEnv->NewStringUTF(value[i].c_str()));
+        if (valueStringRef == nullptr) {
+            return Error() << "Failed to create a string for provided value due to OOM error";
         }
-        mJNIEnv->SetObjectArrayElement(array, i, valueStringResult.value());
+        mJNIEnv->SetObjectArrayElement(arrayRef.get(), i, valueStringRef.get());
     }
-    mJNIEnv->CallVoidMethod(mBundle, putStringArrayMethod, keyStringResult.value(), array);
+    mJNIEnv->CallVoidMethod(mBundle, putStringArrayMethod, keyStringRef.get(), arrayRef.get());
     return {};  // ok result
 }
 
diff --git a/packages/ScriptExecutor/src/JniUtils.cpp b/packages/ScriptExecutor/src/JniUtils.cpp
index adc8d84..0d3f472 100644
--- a/packages/ScriptExecutor/src/JniUtils.cpp
+++ b/packages/ScriptExecutor/src/JniUtils.cpp
@@ -16,13 +16,15 @@
 
 #include "JniUtils.h"
 
+#include "nativehelper/scoped_local_ref.h"
+
 namespace com {
 namespace android {
 namespace car {
 namespace scriptexecutor {
 
-void pushBundleToLuaTable(JNIEnv* env, LuaEngine* luaEngine, jobject bundle) {
-    lua_newtable(luaEngine->getLuaState());
+void pushBundleToLuaTable(JNIEnv* env, lua_State* lua, jobject bundle) {
+    lua_newtable(lua);
     // null bundle object is allowed. We will treat it as an empty table.
     if (bundle == nullptr) {
         return;
@@ -30,127 +32,134 @@
 
     // TODO(b/188832769): Consider caching some of these JNI references for
     // performance reasons.
-    jclass persistableBundleClass = env->FindClass("android/os/PersistableBundle");
+    ScopedLocalRef<jclass> persistableBundleClass(env,
+                                                  env->FindClass("android/os/PersistableBundle"));
     jmethodID getKeySetMethod =
-            env->GetMethodID(persistableBundleClass, "keySet", "()Ljava/util/Set;");
-    jobject keys = env->CallObjectMethod(bundle, getKeySetMethod);
-    jclass setClass = env->FindClass("java/util/Set");
-    jmethodID iteratorMethod = env->GetMethodID(setClass, "iterator", "()Ljava/util/Iterator;");
-    jobject keySetIteratorObject = env->CallObjectMethod(keys, iteratorMethod);
+            env->GetMethodID(persistableBundleClass.get(), "keySet", "()Ljava/util/Set;");
+    ScopedLocalRef<jobject> keys(env, env->CallObjectMethod(bundle, getKeySetMethod));
+    ScopedLocalRef<jclass> setClass(env, env->FindClass("java/util/Set"));
+    jmethodID iteratorMethod =
+            env->GetMethodID(setClass.get(), "iterator", "()Ljava/util/Iterator;");
+    ScopedLocalRef<jobject> keySetIteratorObject(env,
+                                                 env->CallObjectMethod(keys.get(), iteratorMethod));
 
-    jclass iteratorClass = env->FindClass("java/util/Iterator");
-    jmethodID hasNextMethod = env->GetMethodID(iteratorClass, "hasNext", "()Z");
-    jmethodID nextMethod = env->GetMethodID(iteratorClass, "next", "()Ljava/lang/Object;");
+    ScopedLocalRef<jclass> iteratorClass(env, env->FindClass("java/util/Iterator"));
+    jmethodID hasNextMethod = env->GetMethodID(iteratorClass.get(), "hasNext", "()Z");
+    jmethodID nextMethod = env->GetMethodID(iteratorClass.get(), "next", "()Ljava/lang/Object;");
 
-    jclass booleanClass = env->FindClass("java/lang/Boolean");
-    jclass integerClass = env->FindClass("java/lang/Integer");
-    jclass longClass = env->FindClass("java/lang/Long");
-    jclass numberClass = env->FindClass("java/lang/Number");
-    jclass stringClass = env->FindClass("java/lang/String");
-    jclass intArrayClass = env->FindClass("[I");
-    jclass longArrayClass = env->FindClass("[J");
-    jclass stringArrayClass = env->FindClass("[Ljava/lang/String;");
+    ScopedLocalRef<jclass> booleanClass(env, env->FindClass("java/lang/Boolean"));
+    ScopedLocalRef<jclass> integerClass(env, env->FindClass("java/lang/Integer"));
+    ScopedLocalRef<jclass> longClass(env, env->FindClass("java/lang/Long"));
+    ScopedLocalRef<jclass> numberClass(env, env->FindClass("java/lang/Number"));
+    ScopedLocalRef<jclass> stringClass(env, env->FindClass("java/lang/String"));
+    ScopedLocalRef<jclass> intArrayClass(env, env->FindClass("[I"));
+    ScopedLocalRef<jclass> longArrayClass(env, env->FindClass("[J"));
+    ScopedLocalRef<jclass> stringArrayClass(env, env->FindClass("[Ljava/lang/String;"));
     // TODO(b/188816922): Handle more types such as float and integer arrays,
     // and perhaps nested Bundles.
 
-    jmethodID getMethod = env->GetMethodID(persistableBundleClass, "get",
+    jmethodID getMethod = env->GetMethodID(persistableBundleClass.get(), "get",
                                            "(Ljava/lang/String;)Ljava/lang/Object;");
 
     // Iterate over key set of the bundle one key at a time.
-    while (env->CallBooleanMethod(keySetIteratorObject, hasNextMethod)) {
+    while (env->CallBooleanMethod(keySetIteratorObject.get(), hasNextMethod)) {
         // Read the value object that corresponds to this key.
-        jstring key = (jstring)env->CallObjectMethod(keySetIteratorObject, nextMethod);
-        jobject value = env->CallObjectMethod(bundle, getMethod, key);
+        ScopedLocalRef<jstring> key(env,
+                                    (jstring)env->CallObjectMethod(keySetIteratorObject.get(),
+                                                                   nextMethod));
+        ScopedLocalRef<jobject> value(env, env->CallObjectMethod(bundle, getMethod, key.get()));
 
         // Get the value of the type, extract it accordingly from the bundle and
         // push the extracted value and the key to the Lua table.
-        if (env->IsInstanceOf(value, booleanClass)) {
-            jmethodID boolMethod = env->GetMethodID(booleanClass, "booleanValue", "()Z");
-            bool boolValue = static_cast<bool>(env->CallBooleanMethod(value, boolMethod));
-            lua_pushboolean(luaEngine->getLuaState(), boolValue);
-        } else if (env->IsInstanceOf(value, integerClass)) {
-            jmethodID intMethod = env->GetMethodID(integerClass, "intValue", "()I");
-            lua_pushinteger(luaEngine->getLuaState(), env->CallIntMethod(value, intMethod));
-        } else if (env->IsInstanceOf(value, longClass)) {
-            jmethodID longMethod = env->GetMethodID(longClass, "longValue", "()J");
-            lua_pushinteger(luaEngine->getLuaState(), env->CallLongMethod(value, longMethod));
-        } else if (env->IsInstanceOf(value, numberClass)) {
+        if (env->IsInstanceOf(value.get(), booleanClass.get())) {
+            jmethodID boolMethod = env->GetMethodID(booleanClass.get(), "booleanValue", "()Z");
+            bool boolValue = static_cast<bool>(env->CallBooleanMethod(value.get(), boolMethod));
+            lua_pushboolean(lua, boolValue);
+        } else if (env->IsInstanceOf(value.get(), integerClass.get())) {
+            jmethodID intMethod = env->GetMethodID(integerClass.get(), "intValue", "()I");
+            lua_pushinteger(lua, env->CallIntMethod(value.get(), intMethod));
+        } else if (env->IsInstanceOf(value.get(), longClass.get())) {
+            jmethodID longMethod = env->GetMethodID(longClass.get(), "longValue", "()J");
+            lua_pushinteger(lua, env->CallLongMethod(value.get(), longMethod));
+        } else if (env->IsInstanceOf(value.get(), numberClass.get())) {
             // Condense other numeric types using one class. Because lua supports only
             // integer or double, and we handled integer in previous if clause.
-            jmethodID numberMethod = env->GetMethodID(numberClass, "doubleValue", "()D");
+            jmethodID numberMethod = env->GetMethodID(numberClass.get(), "doubleValue", "()D");
             /* Pushes a double onto the stack */
-            lua_pushnumber(luaEngine->getLuaState(), env->CallDoubleMethod(value, numberMethod));
-        } else if (env->IsInstanceOf(value, stringClass)) {
+            lua_pushnumber(lua, env->CallDoubleMethod(value.get(), numberMethod));
+        } else if (env->IsInstanceOf(value.get(), stringClass.get())) {
             // Produces a string in Modified UTF-8 encoding. Any null character
             // inside the original string is converted into two-byte encoding.
             // This way we can directly use the output of GetStringUTFChars in C API that
             // expects a null-terminated string.
             const char* rawStringValue =
-                    env->GetStringUTFChars(static_cast<jstring>(value), nullptr);
-            lua_pushstring(luaEngine->getLuaState(), rawStringValue);
-            env->ReleaseStringUTFChars(static_cast<jstring>(value), rawStringValue);
-        } else if (env->IsInstanceOf(value, intArrayClass)) {
-            jintArray intArray = static_cast<jintArray>(value);
+                    env->GetStringUTFChars(static_cast<jstring>(value.get()), nullptr);
+            lua_pushstring(lua, rawStringValue);
+            env->ReleaseStringUTFChars(static_cast<jstring>(value.get()), rawStringValue);
+        } else if (env->IsInstanceOf(value.get(), intArrayClass.get())) {
+            jintArray intArray = static_cast<jintArray>(value.get());
             const auto kLength = env->GetArrayLength(intArray);
             // Arrays are represented as a table of sequential elements in Lua.
             // We are creating a nested table to represent this array. We specify number of elements
             // in the Java array to preallocate memory accordingly.
-            lua_createtable(luaEngine->getLuaState(), kLength, 0);
+            lua_createtable(lua, kLength, 0);
             jint* rawIntArray = env->GetIntArrayElements(intArray, nullptr);
             // Fills in the table at stack idx -2 with key value pairs, where key is a
             // Lua index and value is an integer from the byte array at that index
             for (int i = 0; i < kLength; i++) {
                 // Stack at index -1 is rawIntArray[i] after this push.
-                lua_pushinteger(luaEngine->getLuaState(), rawIntArray[i]);
-                lua_rawseti(luaEngine->getLuaState(), /* idx= */ -2,
+                lua_pushinteger(lua, rawIntArray[i]);
+                lua_rawseti(lua, /* idx= */ -2,
                             i + 1);  // lua index starts from 1
             }
             // JNI_ABORT is used because we do not need to copy back elements.
             env->ReleaseIntArrayElements(intArray, rawIntArray, JNI_ABORT);
-        } else if (env->IsInstanceOf(value, longArrayClass)) {
-            jlongArray longArray = static_cast<jlongArray>(value);
+        } else if (env->IsInstanceOf(value.get(), longArrayClass.get())) {
+            jlongArray longArray = static_cast<jlongArray>(value.get());
             const auto kLength = env->GetArrayLength(longArray);
             // Arrays are represented as a table of sequential elements in Lua.
             // We are creating a nested table to represent this array. We specify number of elements
             // in the Java array to preallocate memory accordingly.
-            lua_createtable(luaEngine->getLuaState(), kLength, 0);
+            lua_createtable(lua, kLength, 0);
             jlong* rawLongArray = env->GetLongArrayElements(longArray, nullptr);
             // Fills in the table at stack idx -2 with key value pairs, where key is a
             // Lua index and value is an integer from the byte array at that index
             for (int i = 0; i < kLength; i++) {
-                lua_pushinteger(luaEngine->getLuaState(), rawLongArray[i]);
-                lua_rawseti(luaEngine->getLuaState(), /* idx= */ -2,
+                lua_pushinteger(lua, rawLongArray[i]);
+                lua_rawseti(lua, /* idx= */ -2,
                             i + 1);  // lua index starts from 1
             }
             // JNI_ABORT is used because we do not need to copy back elements.
             env->ReleaseLongArrayElements(longArray, rawLongArray, JNI_ABORT);
-        } else if (env->IsInstanceOf(value, stringArrayClass)) {
-            jobjectArray stringArray = static_cast<jobjectArray>(value);
+        } else if (env->IsInstanceOf(value.get(), stringArrayClass.get())) {
+            jobjectArray stringArray = static_cast<jobjectArray>(value.get());
             const auto kLength = env->GetArrayLength(stringArray);
             // Arrays are represented as a table of sequential elements in Lua.
             // We are creating a nested table to represent this array. We specify number of elements
             // in the Java array to preallocate memory accordingly.
-            lua_createtable(luaEngine->getLuaState(), kLength, 0);
+            lua_createtable(lua, kLength, 0);
             // Fills in the table at stack idx -2 with key value pairs, where key is a Lua index and
             // value is an string value extracted from the object array at that index
             for (int i = 0; i < kLength; i++) {
-                jstring element = static_cast<jstring>(env->GetObjectArrayElement(stringArray, i));
+                ScopedLocalRef<jobject> localStringRef(env,
+                                                       env->GetObjectArrayElement(stringArray, i));
+                jstring element = static_cast<jstring>(localStringRef.get());
                 const char* rawStringValue = env->GetStringUTFChars(element, nullptr);
-                lua_pushstring(luaEngine->getLuaState(), rawStringValue);
+                lua_pushstring(lua, rawStringValue);
                 env->ReleaseStringUTFChars(element, rawStringValue);
                 // lua index starts from 1
-                lua_rawseti(luaEngine->getLuaState(), /* idx= */ -2, i + 1);
+                lua_rawseti(lua, /* idx= */ -2, i + 1);
             }
         } else {
             // Other types are not implemented yet, skipping.
             continue;
         }
 
-        const char* rawKey = env->GetStringUTFChars(key, nullptr);
+        const char* rawKey = env->GetStringUTFChars(key.get(), nullptr);
         // table[rawKey] = value, where value is on top of the stack,
         // and the table is the next element in the stack.
-        lua_setfield(luaEngine->getLuaState(), /* idx= */ -2, rawKey);
-        env->ReleaseStringUTFChars(key, rawKey);
+        lua_setfield(lua, /* idx= */ -2, rawKey);
+        env->ReleaseStringUTFChars(key.get(), rawKey);
     }
 }
 
diff --git a/packages/ScriptExecutor/src/JniUtils.h b/packages/ScriptExecutor/src/JniUtils.h
index 57aeb9f..542a91a 100644
--- a/packages/ScriptExecutor/src/JniUtils.h
+++ b/packages/ScriptExecutor/src/JniUtils.h
@@ -16,9 +16,14 @@
 #ifndef PACKAGES_SCRIPTEXECUTOR_SRC_JNIUTILS_H_
 #define PACKAGES_SCRIPTEXECUTOR_SRC_JNIUTILS_H_
 
-#include "LuaEngine.h"
 #include "jni.h"
 
+extern "C" {
+#include "lua.h"
+}
+
+#include <android-base/result.h>
+
 namespace com {
 namespace android {
 namespace car {
@@ -29,7 +34,7 @@
 // converted to the corresponding key-value pairs of the Lua table as long as
 // the Bundle value types are supported. At this point, we support boolean,
 // integer, double and String types in Java.
-void pushBundleToLuaTable(JNIEnv* env, LuaEngine* luaEngine, jobject bundle);
+void pushBundleToLuaTable(JNIEnv* env, lua_State* lua, jobject bundle);
 
 }  // namespace scriptexecutor
 }  // namespace car
diff --git a/packages/ScriptExecutor/src/ScriptExecutorJni.cpp b/packages/ScriptExecutor/src/ScriptExecutorJni.cpp
index cab8ece..d8ddd55 100644
--- a/packages/ScriptExecutor/src/ScriptExecutorJni.cpp
+++ b/packages/ScriptExecutor/src/ScriptExecutorJni.cpp
@@ -83,6 +83,10 @@
 
     LuaEngine* engine = reinterpret_cast<LuaEngine*>(static_cast<intptr_t>(luaEnginePtr));
     LuaEngine::resetListener(new ScriptExecutorListener(env, listener));
+    // Objects passed to native methods are local JNI references.
+    // ScriptExecutorListener constructor above converts local "listener" reference to global
+    // reference. Delete local "listener" reference here because it is no longer needed.
+    env->DeleteLocalRef(listener);
 
     // Load and parse the script
     const char* scriptStr = env->GetStringUTFChars(scriptBody, nullptr);
@@ -103,11 +107,11 @@
     }
 
     // Unpack bundle in publishedData, convert to Lua table and push it to Lua stack.
-    pushBundleToLuaTable(env, engine, publishedData);
+    pushBundleToLuaTable(env, engine->getLuaState(), publishedData);
 
     // Unpack bundle in savedState, convert to Lua table and push it to Lua
     // stack.
-    pushBundleToLuaTable(env, engine, savedState);
+    pushBundleToLuaTable(env, engine->getLuaState(), savedState);
 
     // Execute the function. This will block until complete or error.
     engine->run();
diff --git a/packages/ScriptExecutor/src/ScriptExecutorListener.cpp b/packages/ScriptExecutor/src/ScriptExecutorListener.cpp
index fd6677d..b9cd7c8 100644
--- a/packages/ScriptExecutor/src/ScriptExecutorListener.cpp
+++ b/packages/ScriptExecutor/src/ScriptExecutorListener.cpp
@@ -16,6 +16,9 @@
 
 #include "ScriptExecutorListener.h"
 
+#include "JniUtils.h"
+#include "nativehelper/scoped_local_ref.h"
+
 #include <android-base/logging.h>
 
 namespace com {
@@ -37,16 +40,16 @@
 
 void ScriptExecutorListener::onSuccess(jobject bundle) {
     JNIEnv* env = getCurrentJNIEnv();
-    jclass listenerClass = env->GetObjectClass(mScriptExecutorListener);
-    jmethodID onSuccessMethod =
-            env->GetMethodID(listenerClass, "onSuccess", "(Landroid/os/PersistableBundle;)V");
+    ScopedLocalRef<jclass> listenerClassRef(env, env->GetObjectClass(mScriptExecutorListener));
+    jmethodID onSuccessMethod = env->GetMethodID(listenerClassRef.get(), "onSuccess",
+                                                 "(Landroid/os/PersistableBundle;)V");
     env->CallVoidMethod(mScriptExecutorListener, onSuccessMethod, bundle);
 }
 
 void ScriptExecutorListener::onScriptFinished(jobject bundle) {
     JNIEnv* env = getCurrentJNIEnv();
-    jclass listenerClass = env->GetObjectClass(mScriptExecutorListener);
-    jmethodID onScriptFinished = env->GetMethodID(listenerClass, "onScriptFinished",
+    ScopedLocalRef<jclass> listenerClassRef(env, env->GetObjectClass(mScriptExecutorListener));
+    jmethodID onScriptFinished = env->GetMethodID(listenerClassRef.get(), "onScriptFinished",
                                                   "(Landroid/os/PersistableBundle;)V");
     env->CallVoidMethod(mScriptExecutorListener, onScriptFinished, bundle);
 }
@@ -54,12 +57,24 @@
 void ScriptExecutorListener::onError(const ErrorType errorType, const char* message,
                                      const char* stackTrace) {
     JNIEnv* env = getCurrentJNIEnv();
-    jclass listenerClass = env->GetObjectClass(mScriptExecutorListener);
-    jmethodID onErrorMethod =
-            env->GetMethodID(listenerClass, "onError", "(ILjava/lang/String;Ljava/lang/String;)V");
+    ScopedLocalRef<jclass> listenerClassRef(env, env->GetObjectClass(mScriptExecutorListener));
+    jmethodID onErrorMethod = env->GetMethodID(listenerClassRef.get(), "onError",
+                                               "(ILjava/lang/String;Ljava/lang/String;)V");
+
+    ScopedLocalRef<jstring> messageStringRef(env, env->NewStringUTF(message));
+    if (messageStringRef == nullptr) {
+        LOG(ERROR) << "Failed to create a Java string for provided error message due to OOM error";
+        return;
+    }
+
+    ScopedLocalRef<jstring> stackTraceRef(env, env->NewStringUTF(stackTrace));
+    if (stackTraceRef == nullptr) {
+        LOG(ERROR) << "Failed to create a Java string for stack trace due to OOM error";
+        return;
+    }
 
     env->CallVoidMethod(mScriptExecutorListener, onErrorMethod, static_cast<int>(errorType),
-                        env->NewStringUTF(message), env->NewStringUTF(stackTrace));
+                        messageStringRef.get(), stackTraceRef.get());
 }
 
 JNIEnv* ScriptExecutorListener::getCurrentJNIEnv() {
diff --git a/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/JniUtilsTestHelper.cpp b/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/JniUtilsTestHelper.cpp
index efc34d3..a205b32 100644
--- a/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/JniUtilsTestHelper.cpp
+++ b/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/JniUtilsTestHelper.cpp
@@ -83,8 +83,8 @@
 JNIEXPORT void JNICALL
 Java_com_android_car_scriptexecutor_JniUtilsTest_nativePushBundleToLuaTableCaller(
         JNIEnv* env, jobject object, jlong luaEnginePtr, jobject bundle) {
-    pushBundleToLuaTable(env, reinterpret_cast<LuaEngine*>(static_cast<intptr_t>(luaEnginePtr)),
-                         bundle);
+    LuaEngine* engine = reinterpret_cast<LuaEngine*>(static_cast<intptr_t>(luaEnginePtr));
+    pushBundleToLuaTable(env, engine->getLuaState(), bundle);
 }
 
 JNIEXPORT jint JNICALL Java_com_android_car_scriptexecutor_JniUtilsTest_nativeGetObjectSize(
diff --git a/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/ScriptExecutorTest.java b/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/ScriptExecutorTest.java
index 5decaa3..1a4028a 100644
--- a/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/ScriptExecutorTest.java
+++ b/packages/ScriptExecutor/tests/unit/src/com/android/car/scriptexecutor/ScriptExecutorTest.java
@@ -524,6 +524,23 @@
     }
 
     @Test
+    public void invokeScript_emptyStringValueIsValidValue() throws RemoteException {
+        // Verify that an empty string value is a valid value to be returned from a script.
+        String returnFinalResultScript =
+                "function empty_string(data, state)\n"
+                        + "    result = {data = \"\"}\n"
+                        + "    on_script_finished(result)\n"
+                        + "end\n";
+
+        runScriptAndWaitForResponse(returnFinalResultScript, "empty_string", mPublishedData,
+                new PersistableBundle());
+
+        // Expect to get back a bundle with a single key-value pair {"data": ""}
+        assertThat(mFakeScriptExecutorListener.mFinalResult.size()).isEqualTo(1);
+        assertThat(mFakeScriptExecutorListener.mFinalResult.getString("data")).isEqualTo("");
+    }
+
+    @Test
     public void invokeScript_allPrimitiveSupportedTypesForReturningFinalResult()
             throws RemoteException {
         // Here we verify that all supported primitive types are present in the returned final
diff --git a/service/res/values-ar/strings.xml b/service/res/values-ar/strings.xml
index 9510aee..0b086d4 100644
--- a/service/res/values-ar/strings.xml
+++ b/service/res/values-ar/strings.xml
@@ -169,10 +169,8 @@
     <string name="car_permission_desc_control_car_power_policy" msgid="8565782440893507028">"التحكُّم في سياسة تشغيل ميزات السيارة"</string>
     <string name="car_permission_label_template_renderer" msgid="3464887382919754850">"عرض النماذج"</string>
     <string name="car_permission_desc_template_renderer" msgid="6047233999260920122">"عرض النماذج"</string>
-    <!-- no translation found for car_permission_label_control_car_app_launch (214632389637409226) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_control_car_app_launch (4245527461733374198) -->
-    <skip />
+    <string name="car_permission_label_control_car_app_launch" msgid="214632389637409226">"التحكم في تشغيل التطبيقات"</string>
+    <string name="car_permission_desc_control_car_app_launch" msgid="4245527461733374198">"التحكم في تشغيل التطبيقات"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"جهازي"</string>
     <string name="default_guest_name" msgid="2912812799433131476">"ضيف"</string>
     <string name="importance_default" msgid="8587741629268312938">"مدى الأهمية التلقائي"</string>
diff --git a/service/src/com/android/car/CarShellCommand.java b/service/src/com/android/car/CarShellCommand.java
index f1fec38..19d8a1a 100644
--- a/service/src/com/android/car/CarShellCommand.java
+++ b/service/src/com/android/car/CarShellCommand.java
@@ -199,6 +199,8 @@
     private static final String COMMAND_SET_REARVIEW_CAMERA_ID = "set-rearview-camera-id";
     private static final String COMMAND_GET_REARVIEW_CAMERA_ID = "get-rearview-camera-id";
 
+    private static final String COMMAND_WATCHDOG_CONTROL_PACKAGE_KILLABLE_STATE =
+            "watchdog-control-package-killable-state";
     private static final String COMMAND_WATCHDOG_IO_SET_3P_FOREGROUND_BYTES =
             "watchdog-io-set-3p-foreground-bytes";
     private static final String COMMAND_WATCHDOG_IO_GET_3P_FOREGROUND_BYTES =
@@ -280,6 +282,8 @@
                 android.Manifest.permission.INJECT_EVENTS);
         USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_INJECT_ROTARY,
                 android.Manifest.permission.INJECT_EVENTS);
+        USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_WATCHDOG_CONTROL_PACKAGE_KILLABLE_STATE,
+                PERMISSION_CONTROL_CAR_WATCHDOG_CONFIG);
         USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_WATCHDOG_IO_SET_3P_FOREGROUND_BYTES,
                 PERMISSION_CONTROL_CAR_WATCHDOG_CONFIG);
         USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_WATCHDOG_IO_GET_3P_FOREGROUND_BYTES,
@@ -632,6 +636,10 @@
         pw.println("\t  Gets the name of the camera device CarEvsService is using for " +
                 "the rearview.");
 
+        pw.printf("\t%s true|false <PACKAGE_NAME>\n",
+                COMMAND_WATCHDOG_CONTROL_PACKAGE_KILLABLE_STATE);
+        pw.println("\t  Marks PACKAGE_NAME as killable or not killable on resource overuse ");
+
         pw.printf("\t%s <FOREGROUND_MODE_BYTES>\n", COMMAND_WATCHDOG_IO_SET_3P_FOREGROUND_BYTES);
         pw.println("\t  Sets third-party apps foreground I/O overuse threshold");
 
@@ -640,7 +648,6 @@
 
         pw.printf("\t%s enable|disable\n", COMMAND_WATCHDOG_CONTROL_PROCESS_HEALTH_CHECK);
         pw.println("\t  Enables/disables car watchdog process health check.");
-        pw.println("\t  Set to true to disable the process health check.");
 
         pw.printf("\t%s [REGION_STRING]", COMMAND_DRIVING_SAFETY_SET_REGION);
         pw.println("\t  Set driving safety region.");
@@ -971,6 +978,9 @@
             case COMMAND_GET_REARVIEW_CAMERA_ID:
                 getRearviewCameraId(writer);
                 break;
+            case COMMAND_WATCHDOG_CONTROL_PACKAGE_KILLABLE_STATE:
+                controlWatchdogPackageKillableState(args, writer);
+                break;
             case COMMAND_WATCHDOG_IO_SET_3P_FOREGROUND_BYTES:
                 setWatchdogIoThirdPartyForegroundBytes(args, writer);
                 break;
@@ -2182,6 +2192,23 @@
                 mCarEvsService.getRearviewCameraIdFromCommand());
     }
 
+    private void controlWatchdogPackageKillableState(String[] args, IndentingPrintWriter writer) {
+        if (args.length != 3) {
+            showInvalidArguments(writer);
+            return;
+        }
+        if (!args[1].equals("true") && !args[1].equals("false")) {
+            writer.println("Failed to parse killable state argument. "
+                    + "Valid arguments: killable | not-killable");
+            return;
+        }
+        int currentUserId = ActivityManager.getCurrentUser();
+        mCarWatchdogService.setKillablePackageAsUser(
+                args[2], UserHandle.of(currentUserId), args[1].equals("true"));
+        writer.printf("Set package killable state as '%s' for user '%d' and package '%s'\n",
+                args[1].equals("true") ? "killable" : "not killable", currentUserId, args[2]);
+    }
+
     // Set third-party foreground I/O threshold for car watchdog
     private void setWatchdogIoThirdPartyForegroundBytes(String[] args,
             IndentingPrintWriter writer) {
diff --git a/service/src/com/android/car/telemetry/databroker/DataBrokerImpl.java b/service/src/com/android/car/telemetry/databroker/DataBrokerImpl.java
index c02b1f8..c1ba29b 100644
--- a/service/src/com/android/car/telemetry/databroker/DataBrokerImpl.java
+++ b/service/src/com/android/car/telemetry/databroker/DataBrokerImpl.java
@@ -67,12 +67,6 @@
     /** Bind to script executor 5 times before entering disabled state. */
     private static final int MAX_BIND_SCRIPT_EXECUTOR_ATTEMPTS = 5;
 
-    /**
-     * If script input exceeds this size, it will be piped to script executor instead of directly
-     * passed via binder call.
-     */
-    private static final int LARGE_SCRIPT_INPUT_SIZE_BYTES = 20 * 1024; // 20 kb
-
     private static final String SCRIPT_EXECUTOR_PACKAGE = "com.android.car.scriptexecutor";
     private static final String SCRIPT_EXECUTOR_CLASS =
             "com.android.car.scriptexecutor.ScriptExecutor";
@@ -369,7 +363,7 @@
         mCurrentMetricsConfigKey = new MetricsConfigKey(task.getMetricsConfig().getName(),
                 task.getMetricsConfig().getVersion());
         try {
-            if (task.getDataSizeBytes() >= LARGE_SCRIPT_INPUT_SIZE_BYTES) {
+            if (task.isLargeData()) {
                 Slogf.d(CarLog.TAG_TELEMETRY, "invoking script executor for large input");
                 invokeScriptForLargeInput(task);
             } else {
diff --git a/service/src/com/android/car/telemetry/databroker/ScriptExecutionTask.java b/service/src/com/android/car/telemetry/databroker/ScriptExecutionTask.java
index dfdc2a8..18d0512 100644
--- a/service/src/com/android/car/telemetry/databroker/ScriptExecutionTask.java
+++ b/service/src/com/android/car/telemetry/databroker/ScriptExecutionTask.java
@@ -30,15 +30,37 @@
  * The object can be accessed from any thread. See {@link DataSubscriber} for thread-safety.
  */
 public class ScriptExecutionTask implements Comparable<ScriptExecutionTask> {
+    // Key to the calculated bundle size, which doesn't contain implementation-dependent overhead
+    // and other allocations. It's approximately 10% smaller than the actual size of binder parcel.
+    public static final String APPROX_BUNDLE_SIZE_BYTES_KEY = "approx_bundle_size_bytes";
+
+    /**
+     * Binder transaction size limit is 1MB for all binders per process, so for large script input
+     * file pipe will be used to transfer the data to script executor instead of binder call. This
+     * is the input size threshold above which piping is used.
+     */
+    private static final int LARGE_SCRIPT_INPUT_SIZE_BYTES = 20 * 1024; // 20 kb
+
     private final long mTimestampMillis;
     private final DataSubscriber mSubscriber;
     private final PersistableBundle mData;
+    private final boolean mIsLargeData;
 
     ScriptExecutionTask(DataSubscriber subscriber, PersistableBundle data,
             long elapsedRealtimeMillis) {
         mTimestampMillis = elapsedRealtimeMillis;
         mSubscriber = subscriber;
         mData = data;
+        if (mData.containsKey(APPROX_BUNDLE_SIZE_BYTES_KEY)) {
+            mIsLargeData =
+                    mData.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY) > LARGE_SCRIPT_INPUT_SIZE_BYTES;
+            mData.remove(APPROX_BUNDLE_SIZE_BYTES_KEY);
+        } else {
+            Parcel parcel = Parcel.obtain();
+            parcel.writePersistableBundle(mData);
+            mIsLargeData = parcel.dataSize() > LARGE_SCRIPT_INPUT_SIZE_BYTES;
+            parcel.recycle();
+        }
     }
 
     /** Returns the priority of the task. */
@@ -73,14 +95,9 @@
 
     /**
      * Returns the script input data size in bytes.
-     * TODO(b/201545154): Investigate how to get bundle size without making a full copy.
      */
-    public int getDataSizeBytes() {
-        Parcel parcel = Parcel.obtain();
-        parcel.writePersistableBundle(mData);
-        int size = parcel.dataSize();
-        parcel.recycle();
-        return size;
+    public boolean isLargeData() {
+        return mIsLargeData;
     }
 
     @Override
diff --git a/service/src/com/android/car/telemetry/publisher/statsconverters/AbstractAtomConverter.java b/service/src/com/android/car/telemetry/publisher/statsconverters/AbstractAtomConverter.java
index 730b064..e201f1d 100644
--- a/service/src/com/android/car/telemetry/publisher/statsconverters/AbstractAtomConverter.java
+++ b/service/src/com/android/car/telemetry/publisher/statsconverters/AbstractAtomConverter.java
@@ -16,6 +16,10 @@
 
 package com.android.car.telemetry.publisher.statsconverters;
 
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
+
+import static java.nio.charset.StandardCharsets.UTF_16;
+
 import android.os.PersistableBundle;
 import android.util.SparseArray;
 
@@ -98,6 +102,7 @@
             Map<Long, String> hashToStringMap) throws StatsConversionException {
         PersistableBundle bundle = new PersistableBundle();
         SparseArray<AtomFieldAccessor<T>> parserConfig = getAtomFieldAccessorMap();
+        int bundleByteSize = 0;
         // For each field, if set, add the values from all atoms to list and convert
         for (int i = 0; i < parserConfig.size(); ++i) {
             AtomFieldAccessor<T> atomFieldAccessor = parserConfig.valueAt(i);
@@ -115,11 +120,13 @@
                     }
                     valueList.add(atomFieldAccessor.getField(atomData));
                 }
-                setPersistableBundleArrayField(atomFieldAccessor.getFieldName(), valueList, bundle);
+                bundleByteSize += setPersistableBundleArrayField(
+                        atomFieldAccessor.getFieldName(), valueList, bundle);
             }
         }
         // Check if there are dimension fields needing conversion
         if (dimensionsFieldsIds == null || dimensionsValuesList == null) {
+            bundle.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, bundleByteSize);
             return bundle;
         }
         // Create conversions for fields encoded in dimension fields
@@ -130,9 +137,12 @@
             for (List<DimensionsValue> dvList : dimensionsValuesList) {
                 valueList.add(extractDimensionsValue(dvList.get(i), hashToStringMap));
             }
-            setPersistableBundleArrayField(
-                    getAtomFieldAccessorMap().get(fieldId).getFieldName(), valueList, bundle);
+            bundleByteSize += setPersistableBundleArrayField(
+                    getAtomFieldAccessorMap().get(fieldId).getFieldName(),
+                    valueList,
+                    bundle);
         }
+        bundle.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, bundleByteSize);
         return bundle;
     }
 
@@ -176,44 +186,58 @@
      * @param name key value for the bundle, corresponds to atom field name.
      * @param objList the list to be converted to {@link PersistableBundle} compatible array.
      * @param bundle the {@link PersistableBundle} to put the arrays to.
+     * @return bytes written to PersistableBundle.
      */
-    private static void setPersistableBundleArrayField(
+    private static int setPersistableBundleArrayField(
             String name,
             List<Object> objList,
             PersistableBundle bundle) {
         Object e = objList.get(0);  // All elements of the list are the same type.
+        int len = objList.size();
         if (e instanceof Integer) {
             int[] intArray = new int[objList.size()];
             for (int i = 0; i < objList.size(); ++i) {
                 intArray[i] = (Integer) objList.get(i);
             }
             bundle.putIntArray(name, intArray);
+            return len * Integer.BYTES;
         } else if (e instanceof Long) {
             long[] longArray = new long[objList.size()];
             for (int i = 0; i < objList.size(); ++i) {
                 longArray[i] = (Long) objList.get(i);
             }
             bundle.putLongArray(name, longArray);
+            return len * Long.BYTES;
         } else if (e instanceof String) {
-            bundle.putStringArray(name, objList.toArray(new String[0]));
+            String[] strArray = objList.toArray(new String[0]);
+            bundle.putStringArray(name, strArray);
+            int bytes = 0;
+            for (String str : strArray) {
+                bytes += str.getBytes(UTF_16).length;
+            }
+            return bytes;
         } else if (e instanceof Boolean) {
             boolean[] boolArray = new boolean[objList.size()];
             for (int i = 0; i < objList.size(); ++i) {
                 boolArray[i] = (Boolean) objList.get(i);
             }
             bundle.putBooleanArray(name, boolArray);
+            return len;  // Java boolean is 1 byte
         } else if (e instanceof Double) {
             double[] doubleArray = new double[objList.size()];
             for (int i = 0; i < objList.size(); ++i) {
                 doubleArray[i] = (Double) objList.get(i);
             }
             bundle.putDoubleArray(name, doubleArray);
+            return len * Double.BYTES;
         } else if (e instanceof Float) {
             double[] doubleArray = new double[objList.size()];
             for (int i = 0; i < objList.size(); ++i) {
                 doubleArray[i] = ((Float) objList.get(i)).doubleValue();
             }
             bundle.putDoubleArray(name, doubleArray);
+            return len * Double.BYTES;
         }
+        return 0;
     }
 }
diff --git a/service/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverter.java b/service/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverter.java
index 52f9713..f0803d6 100644
--- a/service/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverter.java
+++ b/service/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverter.java
@@ -16,6 +16,8 @@
 
 package com.android.car.telemetry.publisher.statsconverters;
 
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
+
 import android.os.PersistableBundle;
 
 import com.android.car.telemetry.AtomsProto;
@@ -56,6 +58,9 @@
         }
         PersistableBundle bundle = AtomListConverter.convert(atoms, null, null, null);
         bundle.putLongArray(ELAPSED_TIME_NANOS, elapsedTimes);
+        int bundleSize = bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)
+                + elapsedTimes.length * Long.BYTES;
+        bundle.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, bundleSize);
         return bundle;
     }
 }
diff --git a/service/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverter.java b/service/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverter.java
index 32a139c..e82a6ce 100644
--- a/service/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverter.java
+++ b/service/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverter.java
@@ -16,6 +16,8 @@
 
 package com.android.car.telemetry.publisher.statsconverters;
 
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
+
 import android.os.PersistableBundle;
 
 import com.android.car.telemetry.AtomsProto;
@@ -82,6 +84,9 @@
             elapsedTimesArray[i] = elapsedTimes.get(i);
         }
         bundle.putLongArray(ELAPSED_TIME_NANOS, elapsedTimesArray);
+        int bundleSize = bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)
+                + elapsedTimesArray.length * Long.BYTES;
+        bundle.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, bundleSize);
         return bundle;
     }
 }
diff --git a/service/src/com/android/car/watchdog/WatchdogPerfHandler.java b/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
index 08f7265..557addb 100644
--- a/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
+++ b/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
@@ -673,7 +673,7 @@
                     continue;
                 }
                 PackageResourceUsage usage = cacheAndFetchUsageLocked(stats.uid, genericPackageName,
-                        stats.ioOveruseStats);
+                        stats.ioOveruseStats, stats.forgivenWriteBytes);
                 if (stats.shouldNotify) {
                     /*
                      * Packages that exceed the warn threshold percentage should be notified as well
@@ -1014,7 +1014,8 @@
 
     @GuardedBy("mLock")
     private PackageResourceUsage cacheAndFetchUsageLocked(int uid, String genericPackageName,
-            android.automotive.watchdog.IoOveruseStats internalStats) {
+            android.automotive.watchdog.IoOveruseStats internalStats,
+            android.automotive.watchdog.PerStateBytes forgivenWriteBytes) {
         int userId = UserHandle.getUserHandleForUid(uid).getIdentifier();
         String key = getUserPackageUniqueId(userId, genericPackageName);
         int defaultKillableState = getDefaultKillableStateLocked(genericPackageName);
@@ -1022,7 +1023,7 @@
         if (usage == null) {
             usage = new PackageResourceUsage(userId, genericPackageName, defaultKillableState);
         }
-        usage.update(uid, internalStats, defaultKillableState);
+        usage.update(uid, internalStats, forgivenWriteBytes, defaultKillableState);
         mUsageByUserPackage.put(key, usage);
         return usage;
     }
@@ -1774,6 +1775,7 @@
         }
 
         public void update(int uid, android.automotive.watchdog.IoOveruseStats internalStats,
+                android.automotive.watchdog.PerStateBytes forgivenWriteBytes,
                 @KillableState int defaultKillableState) {
             // Package UID would change if it was re-installed, so keep it up-to-date.
             mUid = uid;
@@ -1793,7 +1795,7 @@
                  */
                 mKillableState = defaultKillableState;
             }
-            ioUsage.update(internalStats);
+            ioUsage.update(internalStats, forgivenWriteBytes);
         }
 
         public ResourceOveruseStats.Builder getResourceOveruseStatsBuilder() {
@@ -1889,17 +1891,10 @@
             mTotalTimesKilled = ioUsage.mTotalTimesKilled;
         }
 
-        void update(android.automotive.watchdog.IoOveruseStats internalStats) {
+        void update(android.automotive.watchdog.IoOveruseStats internalStats,
+                android.automotive.watchdog.PerStateBytes forgivenWriteBytes) {
             mIoOveruseStats = internalStats;
-            if (exceedsThreshold()) {
-                /*
-                 * Forgive written bytes on overuse as the package is either forgiven or killed on
-                 * overuse. When the package is killed, the user may opt to open the corresponding
-                 * app and the package should be forgiven anyways.
-                 * NOTE: If this logic is updated, update the daemon side logic as well.
-                 */
-                mForgivenWriteBytes = internalStats.writtenBytes;
-            }
+            mForgivenWriteBytes = forgivenWriteBytes;
         }
 
         IoOveruseStats getIoOveruseStats(boolean isKillable) {
diff --git a/tests/BugReportApp/res/values-af/strings.xml b/tests/BugReportApp/res/values-af/strings.xml
index 9891c46..0e53cef 100644
--- a/tests/BugReportApp/res/values-af/strings.xml
+++ b/tests/BugReportApp/res/values-af/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Praat en beskryf die kwessie"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Oudioboodskap vir foutverslag om %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname is klaar"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"\'n Foutverslag word reeds saamgestel"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Foutverslag is aan die gang"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"\'n Foutverslag is saamgestel"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Voeg oudio by"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Voeg oudio by en Laai op"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Laai op"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Laai op na GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Gee asseblief toestemmings"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Foutverslag word reeds saamgestel"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Foutverslaggewing het begin"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Foutverslag is aan die gang"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Foutverslag is begin"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Foutverslag het misluk"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kon nie skerm opneem nie"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Stortingstand het misluk"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate het misluk"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Foutverslag is aan die gang"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Foutverslag is saamgestel"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Foutverslag is gaan haal"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Foutverslag se statuskanaal"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-am/strings.xml b/tests/BugReportApp/res/values-am/strings.xml
index 9013eac..83f7059 100644
--- a/tests/BugReportApp/res/values-am/strings.xml
+++ b/tests/BugReportApp/res/values-am/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ችግሩን ይናገሩ እና ይግለጹ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ላይ የሳንካ ሪፖርት የኦዲዮ መልእከት"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ቀረጻ አልቋል"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"አንድ የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"የሳንካ ሪፖርት በሂደት ላይ ነው"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"አንድ የሳንካ ሪፖርት ተሰብስቧል"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ኦዲዮ አክል"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ኦዲዮን አክል እና ስቀል"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ስቀል"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"ወደ GCS ስቀል"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"እባክዎ ፈቃዶችን ይስጡ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ሳንካን ሪፖርት ማድረግ ስራ ጀምሯል"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"የሳንካ ሪፖርት በሂደት ላይ ነው"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"የሳንካ ሪፖርት ተጀምሯል"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"የሳንካ ሪፖርት አልተሳካም"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ማያ ገጽን ማንሳት አልተሳካም"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"የስህተት ምዝግብ አልተሳካም"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"የስህተት ምዝግብ አልተሳካም"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"የሳንካ ሪፖርት በሂደት ላይ ነው"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"የሳንካ ሪፖርት ተሰብስቧል"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"የሳንካ ሪፖርት ተሰብስቧል"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"የሳንካ ሪፖርት ሁኔታ ሰርጥ"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ar/strings.xml b/tests/BugReportApp/res/values-ar/strings.xml
index 5ffd7e2..8a5f6af 100644
--- a/tests/BugReportApp/res/values-ar/strings.xml
+++ b/tests/BugReportApp/res/values-ar/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"التحدث ووصف المشكلة"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"رسالة صوتية لتقرير الخطأ في %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"انتهى التسجيل."</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"جارٍ جمع تقرير أخطاء."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"تجميع تقرير الخطأ قيد التقدّم."</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"تم جمع تقرير أخطاء."</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"إضافة رسالة صوتية"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"إضافة رسالة صوتية والتحميل"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"تحميل"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"تحميل إلى GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"يُرجى منح الأذونات."</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"جارٍ جمع تقرير الأخطاء."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"بدأ إجراء تقرير الخطأ."</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"تجميع تقرير الخطأ قيد التقدّم."</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"بدأ تقرير الخطأ."</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"تعذّر إعداد تقرير الأخطاء."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"تعذّر الحصول على لقطة شاشة."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"تعذّر نسخ الحالة."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"تعذّر بدء خدمة Dumpstate."</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"تقرير الأخطاء قيد التقدّم."</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"تم جمع تقرير الأخطاء."</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"تم تجميع تقرير الخطأ."</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"قناة حالة تقرير الأخطاء"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-as/strings.xml b/tests/BugReportApp/res/values-as/strings.xml
index 2b6c382..41609af 100644
--- a/tests/BugReportApp/res/values-as/strings.xml
+++ b/tests/BugReportApp/res/values-as/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"কওক আৰু সমস্যাটোৰ বিষয়ে বৰ্ণনা কৰক"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%sত বাগ ৰিপ’ৰ্টৰ বাবে অডিঅ’ বাৰ্তা"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ৰেকৰ্ড কৰা সম্পূৰ্ণ হ’ল"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"এটা বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"বাগ ৰিপ’ৰ্ট প্ৰগতিত আছে"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"এটা বাগ ৰিপ’ৰ্ট সংগ্ৰহ কৰা হৈছে"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"অডিঅ’ যোগ কৰক"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"অডিঅ’ যোগ কৰক আৰু আপল’ড কৰক"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"আপল’ড কৰক"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSত আপল’ড কৰক"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুগ্ৰহ কৰি অনুমতি প্ৰদান কৰক"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"বাগ ৰিপ’ৰ্ট কৰাটো আৰম্ভ হৈছে"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"বাগ ৰিপ’ৰ্ট প্ৰগতিত আছে"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"বাগ ৰিপ’ৰ্ট আৰম্ভ কৰা হৈছে"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"বাগ ৰিপ’ৰ্ট বিফল হ’ল"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রীন কেপচাৰ কৰাত বিফল হ’ল"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্প ষ্টেট বিফল হ’ল"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ডাম্পষ্টেট বিফল হ’ল"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"বাগ ৰিপ’ৰ্ট প্ৰগতিত আছে"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"বাগ ৰিপ’র্ট সংগ্ৰহ কৰা হৈছে"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"বাগ ৰিপ’ৰ্ট সংগ্ৰহ কৰা হৈছে"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"বাগ ৰিপ’ৰ্টৰ স্থিতিৰ চেনেল"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-az/strings.xml b/tests/BugReportApp/res/values-az/strings.xml
index 8fea2ff..fc5129d 100644
--- a/tests/BugReportApp/res/values-az/strings.xml
+++ b/tests/BugReportApp/res/values-az/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Danışın &amp; Məsələni təsvir edin"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s radələrində baq raportu üçün Audio mesaj"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yazma bitdi"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Baq hesabatı hazırda əldə edilir"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Baq hesabatı davam edir"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Baq hesabatı əldə edilib"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio əlavə edin"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio əlavə edin və yükləyin"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yükləyin"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'a yükləyin"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"İcazələri təmin edin"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Baq hesabatı hazırda əldə edilir"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Baq raportlaması başladı"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Baq hesabatı davam edir"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Baq hesabatı başladılıb"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Baq hesabatı alınmadı"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran çəkilişi alınmadı"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dampinq alınmadı"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dampinq alınmadı"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Baq hesabatı davam edir"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Baq hesabatı əldə edilib"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Baq hesabatı əldə edilib"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Baq hesabatı status kanalı"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-b+sr+Latn/strings.xml b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
index 243ec44..8340b2a 100644
--- a/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
+++ b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Izgovorite i objasnite problem"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio poruka za izveštaj o grešci u %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izveštaj o grešci se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"U toku je pravljenje izveštaja o grešci"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izveštaj o grešci"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj audio i otpremi"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Otpremi"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Otpremi u GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte dozvole"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izveštaj o grešci se već prikuplja"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pokrenut je izveštaj o grešci"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"U toku je pravljenje izveštaja o grešci"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Izveštaj o grešci je pokrenut"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Pravljenje izveštaja o grešci nije uspelo"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspelo"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Snimanje stanja nije uspelo"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U toku je pravljenje izveštaja o grešci"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izveštaj o grešci je prikupljen"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Izveštaj o grešci je prikupljen"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izveštaja o grešci"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-be/strings.xml b/tests/BugReportApp/res/values-be/strings.xml
index 41b83d9..14df116 100644
--- a/tests/BugReportApp/res/values-be/strings.xml
+++ b/tests/BugReportApp/res/values-be/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Апісанне праблемы"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Галасавое паведамленне для справаздачы пра памылкі ў %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запіс скончаны"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Справаздача пра памылкі ўжо складаецца"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Справаздача пра памылку апрацоўваецца"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Справаздача пра памылкі складзена"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Дадаць аўдыя"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Дадаць аўдыя і запампаваць"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Запампаваць"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Запампаваць у GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Дайце дазволы"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Справаздача пра памылкі ўжо складаецца"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Запушчана справаздача пра памылкі"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Справаздача пра памылку апрацоўваецца"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Пачалося стварэнне справаздачы пра памылку"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Не ўдалося стварыць справаздачу пра памылкі"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не ўдалося зрабіць здымак экрана"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Не ўдалося стварыць дамп стану"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Збой сэрвісу Dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Справаздача пра памылкі апрацоўваецца"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Справаздача пра памылкі складзена"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Справаздача пра памылку загружана"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану справаздачы пра памылкі"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-bg/strings.xml b/tests/BugReportApp/res/values-bg/strings.xml
index 32c9ab9..3d8c68e 100644
--- a/tests/BugReportApp/res/values-bg/strings.xml
+++ b/tests/BugReportApp/res/values-bg/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Използвайте гласа си, за да опишете проблема"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудиосъобщение за сигнала за програмна грешка в %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Записването завърши"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Създаването на сигнал за програмна грешка вече е в ход"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Създава се сигнал за програмна грешка"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Създаден бе сигнал за програмна грешка"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Добавяне на аудио"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Добавяне на аудио и качване"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Качване"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Качване в GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Моля, предоставете разрешения"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Създаването на сигнал за програмна грешка вече е в ход"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Подаването на сигнал за програмна грешка започна"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Създава се сигнал за програмна грешка"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Сигналът за програмна грешка стартира"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Създаването на сигнал за програмна грешка не бе успешно"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Заснемането на екрана не бе успешно"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Създаването на моментна снимка на състоянието не бе успешно"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Създаването на моментна снимка на състоянието не бе успешно"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Създава се сигнал за програмна грешка"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Сигналът за програмна грешка е създаден"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Сигналът за програмна грешка е събран"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за състоянието на сигнала за програмна грешка"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-bn/strings.xml b/tests/BugReportApp/res/values-bn/strings.xml
index ef19f4d..ae550c9 100644
--- a/tests/BugReportApp/res/values-bn/strings.xml
+++ b/tests/BugReportApp/res/values-bn/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"কথা বলুন এবং সমস্যার বিষয়ে বিবরণ দিন"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"সমস্যার বিষয়ে রিপোর্ট করার জন্য %s-এ অডিও মেসেজ করুন"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"রেকর্ড করা হয়ে গেছে"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ইতিমধ্যে একটি সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হচ্ছে"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়েছে"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"অডিও মেসেজ যোগ করুন"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"অডিও যোগ করুন এবং আপলোড করুন"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"আপলোড করুন"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-এ আপলোড করুন"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুমতির অনুমোদন দিন"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"সমস্যার বিষয়ে রিপোর্ট ইতিমধ্যে সংগ্রহ করা হচ্ছে"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"সমস্যার বিষয়ে রিপোর্ট করা শুরু করুন"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"সমস্যার বিষয়ে রিপোর্ট করা যায়নি"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রিন ক্যাপচার করা যায়নি"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্পের স্ট্যাটাস লোড করা যায়নি"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"সমস্যার বিষয়ে রিপোর্ট প্রগ্রেসে রয়েছে"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"সমস্যার বিষয়ে রিপোর্টের স্ট্যাটাসের চ্যানেল"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-bs/strings.xml b/tests/BugReportApp/res/values-bs/strings.xml
index 0fde893..7963f60 100644
--- a/tests/BugReportApp/res/values-bs/strings.xml
+++ b/tests/BugReportApp/res/values-bs/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite problem"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvučna poruka za izvještaj o grešci u %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvještaj o greškama se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Kreiranje izvještaja o grešci je u toku"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izvještaj o greškama"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvučnu poruku"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvučnu poruku i otpremi"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Otpremi"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Otpremi na GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte odobrenja"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvještaj o greškama se već prikuplja"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Započeto je izvještavanje o grešci"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Kreiranje izvještaja o grešci je u toku"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Izvještaj o grešci je pokrenut"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Kreiranje izvještaja o greškama nije uspjelo"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspjelo"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Odbacivanje stanja nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Prikupljanje informacija o stanju nije uspjelo"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kreiranje izvještaja o greškama je u toku"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvještaj o greškama je prikupljen"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Izvještaj o grešci je prikupljen"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Status kanala izvještaja o greškama"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ca/strings.xml b/tests/BugReportApp/res/values-ca/strings.xml
index dd4d1bc..1035d6f 100644
--- a/tests/BugReportApp/res/values-ca/strings.xml
+++ b/tests/BugReportApp/res/values-ca/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Enuncia i descriu el problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Missatge d\'àudio de l\'informe d\'errors a les %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ha finalitzat la gravació"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ja s\'està recollint un informe d\'errors"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"L\'informe d\'errors està en curs"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S\'ha recollit un informe d\'errors"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Afegeix àudio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Afegeix àudio i penja"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Penja"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Penja a GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedeix permisos"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ja s\'està recollint l\'informe d\'errors"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"S\'ha iniciat l\'informe d\'errors"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"L\'informe d\'errors està en curs"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"L\'informe d\'errors ha començat"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Ha fallat l\'informe d\'errors"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No s\'ha pogut capturar la pantalla"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ha fallat l\'estat d\'abocament"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"L\'estat d\'abocament ha fallat"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"L\'informe d\'errors està en curs"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"S\'ha recollit l\'informe d\'errors"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"L\'informe d\'errors s\'ha recollit"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de l\'estat de l\'informe d\'errors"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-cs/strings.xml b/tests/BugReportApp/res/values-cs/strings.xml
index f4ebf47..13437aa 100644
--- a/tests/BugReportApp/res/values-cs/strings.xml
+++ b/tests/BugReportApp/res/values-cs/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Popište problém nahlas"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hlasová zpráva pro hlášení o chybě v %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávání dokončeno"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Zaznamenávání zprávy o chybě již probíhá"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Probíhá vytváření zprávy o chybě"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zpráva o chybě byla zaznamenána"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Přidat zvuk"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Přidat zvuk a nahrát"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Nahrát"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Nahrát do GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Udělte prosím oprávnění"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Zaznamenávání zprávy o chybě již probíhá"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Nahlašování chyby bylo zahájeno"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Probíhá vytváření zprávy o chybě"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Vytváření zprávy o chybě"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Vytvoření zprávy o chybě se nezdařilo"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snímek obrazovky se nezdařil"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vypsání stavu se nezdařilo"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Vypsání stavu se nezdařilo"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Probíhá vytváření zprávy o chybě"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Zpráva o chybě je zaznamenána"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Zpráva o chybě byla zaznamenána"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu zprávy o chybě"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-da/strings.xml b/tests/BugReportApp/res/values-da/strings.xml
index b9459fa..ca716e3 100644
--- a/tests/BugReportApp/res/values-da/strings.xml
+++ b/tests/BugReportApp/res/values-da/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Tal og beskriv problemet"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Lydbesked for fejlrapport kl. %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registreringen er afsluttet"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Der indsamles allerede en fejlrapport"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Fejlrapporten er under udformning"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Der er blevet indsamlet en fejlrapport"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tilføj lyd"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tilføj lyd og upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload til GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Giv tilladelser"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Der indsamles allerede fejlrapport"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Fejlrapportering er i gang"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Fejlrapporten er under udformning"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Fejlrapporten er påbegyndt"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Fejlrapporten blev ikke oprettet"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot mislykkedes"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump-tilstand mislykkedes"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Indsamlingstilstand mislykkedes"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Fejlrapporten er under udformning"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fejlrapporten er indsamlet"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Fejlrapporten er blevet indsamlet"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for fejlrapporten"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-de/strings.xml b/tests/BugReportApp/res/values-de/strings.xml
index eeca3d6..cfc0bbe 100644
--- a/tests/BugReportApp/res/values-de/strings.xml
+++ b/tests/BugReportApp/res/values-de/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Erkläre das Problem"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audionachricht für Fehlerbericht bei %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Aufnahme abgeschlossen"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ein Fehlerbericht wird bereits erstellt"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Der Fehlerbericht ist in Bearbeitung"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ein Fehlerbericht wurde erstellt"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audionachricht hinzufügen"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audionachricht hinzufügen &amp; hochladen"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Hochladen"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Auf GSC hochladen"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Erteile Berechtigungen"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Fehlerbericht wird bereits erstellt"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Fehlerbericht wird gestartet"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Der Fehlerbericht ist in Bearbeitung"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Fehlerbericht wird erstellt"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Fehlerbericht fehlgeschlagen"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Fehler bei der Aufnahme des Screenshots"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Fehler beim Erstellen des Dump-Status"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Fehler beim Erstellen des Dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Der Fehlerbericht ist in Bearbeitung"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fehlerbericht wird erstellt"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Der Fehlerbericht wurde erstellt"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal für den Fehlerbericht-Status"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-el/strings.xml b/tests/BugReportApp/res/values-el/strings.xml
index 8f2d5a6..e3bb0ec 100644
--- a/tests/BugReportApp/res/values-el/strings.xml
+++ b/tests/BugReportApp/res/values-el/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Εκφωνήστε το πρόβλημα που αντιμετωπίζετε."</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ηχητικό μήνυμα για αναφορά σφάλματος στις %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Η εγγραφή ολοκληρώθηκε."</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Γίνεται ήδη λήψη μιας αναφοράς σφάλματος."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Η αναφορά σφάλματος είναι σε εξέλιξη"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Έγινε λήψη μιας αναφοράς σφάλματος."</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Προσθήκη ήχου"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Προσθήκη ήχου και μεταφόρτωση"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Μεταφόρτωση"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Μεταφόρτωση στο GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Παραχωρήστε άδειες"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Γίνεται ήδη λήψη αναφοράς σφάλματος."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Η αναφορά σφαλμάτων ξεκίνησε"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Η αναφορά σφάλματος είναι σε εξέλιξη"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Η αναφορά σφάλματος ξεκίνησε"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Η αναφορά σφάλματος απέτυχε."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Η καταγραφή οθόνης απέτυχε."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Η κατάσταση απόρριψης απέτυχε."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Η κατάσταση αποτύπωσης απέτυχε"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Η αναφορά σφάλματος είναι σε εξέλιξη."</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Γίνεται λήψη αναφοράς σφάλματος."</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Η αναφορά σφάλματος συλλέχθηκε"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Κανάλι κατάστασης αναφοράς σφάλματος"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-en-rAU/strings.xml b/tests/BugReportApp/res/values-en-rAU/strings.xml
index f6b112f..02e32cd 100644
--- a/tests/BugReportApp/res/values-en-rAU/strings.xml
+++ b/tests/BugReportApp/res/values-en-rAU/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Bug report is in progress"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Bug report is in progress"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bug report started"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate failed"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bug report has been collected"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-en-rCA/strings.xml b/tests/BugReportApp/res/values-en-rCA/strings.xml
index f6b112f..02e32cd 100644
--- a/tests/BugReportApp/res/values-en-rCA/strings.xml
+++ b/tests/BugReportApp/res/values-en-rCA/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Bug report is in progress"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Bug report is in progress"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bug report started"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate failed"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bug report has been collected"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-en-rGB/strings.xml b/tests/BugReportApp/res/values-en-rGB/strings.xml
index f6b112f..02e32cd 100644
--- a/tests/BugReportApp/res/values-en-rGB/strings.xml
+++ b/tests/BugReportApp/res/values-en-rGB/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Bug report is in progress"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Bug report is in progress"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bug report started"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate failed"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bug report has been collected"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-en-rIN/strings.xml b/tests/BugReportApp/res/values-en-rIN/strings.xml
index f6b112f..02e32cd 100644
--- a/tests/BugReportApp/res/values-en-rIN/strings.xml
+++ b/tests/BugReportApp/res/values-en-rIN/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Bug report is in progress"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Bug report is in progress"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bug report started"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate failed"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bug report has been collected"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-en-rXC/strings.xml b/tests/BugReportApp/res/values-en-rXC/strings.xml
index b3b3aa9..8bae50a 100644
--- a/tests/BugReportApp/res/values-en-rXC/strings.xml
+++ b/tests/BugReportApp/res/values-en-rXC/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎Speak &amp; Describe The Issue‎‏‎‎‏‎"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎Audio message for bug report at %s‎‏‎‎‏‎"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Recording finished‎‏‎‎‏‎"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎A bug report is already being collected‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎Bug report is in progress‎‏‎‎‏‎"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎A bug report has been collected‎‏‎‎‏‎"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎Add Audio‎‏‎‎‏‎"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎Add Audio &amp; Upload‎‏‎‎‏‎"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎Upload‎‏‎‎‏‎"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎Upload to GCS‎‏‎‎‏‎"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎Please grant permissions‎‏‎‎‏‎"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎Bug report already being collected‎‏‎‎‏‎"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎Bug reporting is started‎‏‎‎‏‎"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎Bug report is in progress‎‏‎‎‏‎"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎Bug report started‎‏‎‎‏‎"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎Bug report failed‎‏‎‎‏‎"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎Screen capture failed‎‏‎‎‏‎"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎Dump state failed‎‏‎‎‏‎"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎Dumpstate failed‎‏‎‎‏‎"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Bug report is in progress‎‏‎‎‏‎"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎Bug report is collected‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎Bug report has been collected‎‏‎‎‏‎"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎Bug report status channel‎‏‎‎‏‎"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-es-rUS/strings.xml b/tests/BugReportApp/res/values-es-rUS/strings.xml
index 3216579..105bf53 100644
--- a/tests/BugReportApp/res/values-es-rUS/strings.xml
+++ b/tests/BugReportApp/res/values-es-rUS/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaje de audio sobre el informe de errores de la(s) %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Finalizó la grabación"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Generando informe de errores"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se recopiló un informe de errores"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Agregar audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Agregar audio y subir"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Subir"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Subir a GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Otorga los permisos correspondientes"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Se inició el informe de errores"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Generando informe de errores"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Se inició el informe de errores"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"No se pudo generar el informe de errores"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se pudo tomar la captura de pantalla"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Se produjo un error con el estado de volcado"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Se produjo un error con el estado de volcado"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en progreso"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se recopiló el informe de errores"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"El informe de errores está listo"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado del informe de errores"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-es/strings.xml b/tests/BugReportApp/res/values-es/strings.xml
index 9f54a27..74361e1 100644
--- a/tests/BugReportApp/res/values-es/strings.xml
+++ b/tests/BugReportApp/res/values-es/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaje de audio para el informe de errores de %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Grabación terminada"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"El informe de errores está en curso"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se ha recopilado un informe de errores"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Añadir audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Añadir audio y subir"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Subir"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Subir a GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Se ha iniciado el informe de errores"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"El informe de errores está en curso"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Se ha iniciado el informe de errores"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"No se ha podido crear el informe de errores"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se ha podido hacer la captura de pantalla"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"No se ha podido obtener el estado de volcado"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"No se ha podido obtener el estado de volcado"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en curso"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se ha recopilado el informe de errores"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Se ha recogido el informe de errores"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado de informes de errores"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-et/strings.xml b/tests/BugReportApp/res/values-et/strings.xml
index abba855..99aa45d 100644
--- a/tests/BugReportApp/res/values-et/strings.xml
+++ b/tests/BugReportApp/res/values-et/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kõnelege ja kirjeldage probleemi"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Helisõnum veaaruande kohta: %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Salvestamine lõpetati"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Veaaruannet juba jäädvustatakse"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Veaaruande jäädvustamine on pooleli"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Jäädvustati veaaruanne"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lisa heli"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lisa heli ja laadi üles"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Laadi üles"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Laadi üles teenusesse GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Andke load"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Veaaruannet juba jäädvustatakse"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Veaaruande loomist alustati"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Veaaruande jäädvustamine on pooleli"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Veaaruande jäädvustamist on alustatud"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Veaaruande jäädvustamine ebaõnnestus"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekraanikuva jäädvustamine ebaõnnestus"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Mälutõmmise olek: ebaõnnestus"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Mälutõmmise jäädvustamine ebaõnnestus"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Veaaruande jäädvustamine on pooleli"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Veaaruanne on jäädvustatud"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Veaaruanne on jäädvustatud"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Veaaruande oleku kanal"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-eu/strings.xml b/tests/BugReportApp/res/values-eu/strings.xml
index fa395a9..aab592b 100644
--- a/tests/BugReportApp/res/values-eu/strings.xml
+++ b/tests/BugReportApp/res/values-eu/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Azaldu arazoa ozen"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Akatsen txostenerako audio-mezua (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Amaitu da grabatzen"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dagoeneko bildu da akatsen txosten bat"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bildu da akatsen txosten bat"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Gehitu audioa"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Gehitu eta kargatu audioa"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Kargatu"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Kargatu Google-ren hodeiko biltegira"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Eman baimenak"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dagoeneko bildu da akatsen txostena"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hasi da akatsen txostena sortzen"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"Ezin izan da sortu akatsen txostena"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ezin izan da egin pantaila-argazkia"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ezin izan da irauli egoera"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Akatsen txostena sortzen"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bildu da akatsen txostena"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Akatsen txostenaren egoeraren kanala"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-fa/strings.xml b/tests/BugReportApp/res/values-fa/strings.xml
index 86b451a..1b9513b 100644
--- a/tests/BugReportApp/res/values-fa/strings.xml
+++ b/tests/BugReportApp/res/values-fa/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"بیان و توضیح مشکل"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"پیام صوتی برای گزارش اشکال در %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ضبط تمام شد"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"گزارش اشکالی از قبل جمع‌آوری شده است"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"گزارش اشکال درحال انجام است"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"گزارش اشکالی جمع‌آوری شد"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"افزودن صدا"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"افزودن صدا و بارگذاری"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"بارگذاری"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"بارگذاری در GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"لطفاً اجازه اعطا کنید"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"گزارش اشکال از قبل جمع‌آوری شده است"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"گزارش اشکال شروع شد"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"گزارش اشکال درحال انجام است"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"روند گزارش اشکال شروع شد"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"گزارش اشکال انجام نشد"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ضبط صفحه انجام نشد"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"وضعیت کپی نشد"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"گزارش سیستم و فایل‌های وضعیت کنونی جمع‌آوری نشد"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"گزارش اشکال درحال انجام است"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"گزارش اشکال جمع‌آوری شده است"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"گزارش اشکال جمع‌آوری شده است"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"کانال وضعیت گزارش اشکال"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-fi/strings.xml b/tests/BugReportApp/res/values-fi/strings.xml
index f1f4571..be203a8 100644
--- a/tests/BugReportApp/res/values-fi/strings.xml
+++ b/tests/BugReportApp/res/values-fi/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kerro ongelmasta tarkemmin puhumalla"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ääniviesti virheraportin kohdassa %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tallennus lopetettu"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Virheraporttia kerätään jo"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Virheraporttia luodaan"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Virheraportti on kerätty"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lisää ääniviesti"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lisää ääniviesti ja lataa"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Lataa"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Lataa GCS:ään"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Myönnä käyttöluvat"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Virheraporttia kerätään jo"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Virheraportointi aloitettu"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Virheraporttia luodaan"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Virheraportointi aloitettu"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Virheraportti ei onnistunut"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kuvakaappaus ei onnistunut"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vedoksen tilavirhe"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate-virhe"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Virheraporttia luodaan"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Virheraportti kerätty"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Virheraportti on kerätty"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Virheraportin tilakanava"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-fr-rCA/strings.xml b/tests/BugReportApp/res/values-fr-rCA/strings.xml
index 21a12d0..ab99d37 100644
--- a/tests/BugReportApp/res/values-fr-rCA/strings.xml
+++ b/tests/BugReportApp/res/values-fr-rCA/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Message audio pour le rapport de bogue à %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bogue est déjà en cours de récupération"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Le rapport de bogue est en cours de création"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bogue a été récupéré"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ajouter un message audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ajouter un message audio et téléverser"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Téléverser"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Téléverser sur GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Rapport de bogue déjà en cours de récupération"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"La création d\'un rapport de bogue est commencée"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Le rapport de bogue est en cours de création"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Le rapport de bogue a commencé"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bogue"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la capture"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Échec de l\'état de la capture"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bogue est en cours de création"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Récupération du rapport de bogue en cours…"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Le rapport de bogue a été collecté"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bogue"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-fr/strings.xml b/tests/BugReportApp/res/values-fr/strings.xml
index ff67a34..77453fb 100644
--- a/tests/BugReportApp/res/values-fr/strings.xml
+++ b/tests/BugReportApp/res/values-fr/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Message audio pour le rapport de bug à %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bug est déjà en cours de création"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Le rapport de bug est en cours de création"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bug a été créé"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ajouter un message audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ajouter un message audio et l\'importer"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Importer"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Importer sur GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Un rapport de bug est déjà en cours de création"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"La création d\'un rapport de bug a commencé"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Le rapport de bug est en cours de création"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"La création du rapport de bug a commencé"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bug"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la copie"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Échec de l\'état de la copie"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bug est en cours de création"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Le rapport de bug a été créé"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Le rapport de bug a été récupéré"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bug"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-gl/strings.xml b/tests/BugReportApp/res/values-gl/strings.xml
index adaa47a..a7e4a96 100644
--- a/tests/BugReportApp/res/values-gl/strings.xml
+++ b/tests/BugReportApp/res/values-gl/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fala e describe o problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaxe de audio para o informe de erro (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"A gravación rematou"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xa se está recompilando un informe de erros"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Recompilando informe de erros"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Recompilouse un informe de erros"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Engadir audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Engadir audio e cargar"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Cargar"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Cargar en GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Recompilando xa un informe de erros"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Iniciouse o informe de erro"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Recompilando informe de erros"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Iniciouse o informe de erros"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Produciuse un erro no informe de erros"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Produciuse un erro ao capturar a pantalla"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Produciuse un erro no estado do baleirado"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Produciuse un erro no estado do baleirado"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O informe de erros está en curso"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Recompilouse o informe de erros"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Recompilouse o informe de erros"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canle de estado do informe de erros"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-gu/strings.xml b/tests/BugReportApp/res/values-gu/strings.xml
index 124fec9..b213bd6 100644
--- a/tests/BugReportApp/res/values-gu/strings.xml
+++ b/tests/BugReportApp/res/values-gu/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"સમસ્યા જણાવો અને વર્ણન કરો"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s વાગ્યે ખામીની જાણકારી માટેનો ઑડિયો સંદેશ"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"રેકૉર્ડ કરવાનું સમાપ્ત થયું"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ખામીની જાણકારી પહેલેથી એકત્રિત કરવામાં આવી રહી છે"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"બગ રિપોર્ટની પ્રક્રિયા ચાલુ છે"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ખામીની જાણકારી એકત્રિત કરવામાં આવી છે"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ઑડિયો ઉમેરો"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ઑડિયો ઉમેરો અને અપલોડ કરો"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"અપલોડ કરો"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS પર અપલોડ કરો"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"કૃપા કરીને પરવાનાગીઓ આપો"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ખામીની જાણકારી પહેલેથી એકત્રિત કરેલી છે"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ખામીની જાણકારી આપવાની સુવિધા શરૂ કરી છે"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"બગ રિપોર્ટની પ્રક્રિયા ચાલુ છે"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"બગ રિપોર્ટની પ્રક્રિયા શરૂ થઈ છે"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ખામીની જાણકારી નિષ્ફળ થઈ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"સ્ક્રીન કૅપ્ચર કરવું નિષ્ફળ થયું"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ડમ્પ સ્ટેટ નિષ્ફળ થયું"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ડમ્પસ્ટેટ નિષ્ફળ થયું"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ખામીની જાણકારીની પ્રક્રિયા ચાલુ છે"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ખામીની જાણકારી એકત્રિત કરેલી છે"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"બગ રિપોર્ટ એકત્રિત કરવામાં આવ્યો છે"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ખામીની જાણકારી સ્ટેટસ ચૅનલ"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-hi/strings.xml b/tests/BugReportApp/res/values-hi/strings.xml
index ff12509..5e2a7a3 100644
--- a/tests/BugReportApp/res/values-hi/strings.xml
+++ b/tests/BugReportApp/res/values-hi/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलें और समस्या बताएं"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"गड़बड़ी की रिपोर्ट का ऑडियो मैसेज इस %s पर उपलब्ध है"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रिकॉर्डिंग पूरी हुई"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ऑडियो मैसेज जोड़ें"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ऑडियो मैसेज जोड़ें और अपलोड करें"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड करें"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS (जीसीएस) पर अपलोड करें"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दें"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"गड़बड़ी की रिपोर्ट मिलने की सुविधा उपलब्ध है"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"गड़बड़ी की रिपोर्ट नहीं बन पाई"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कैप्चर नहीं की जा सकी"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप की स्थिति लोड नहीं की जा सकी"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"गड़बड़ी की रिपोर्ट बनाई जा रही है"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"गड़बड़ी की रिपोर्ट की स्थिति का चैनल"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-hr/strings.xml b/tests/BugReportApp/res/values-hr/strings.xml
index 86945ea..c599807 100644
--- a/tests/BugReportApp/res/values-hr/strings.xml
+++ b/tests/BugReportApp/res/values-hr/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite poteškoću"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audioporuka za izvješće o programskoj pogrešci u %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvješće o programskoj pogrešci već se izrađuje"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"U tijeku je izrada izvješća o programskim pogreškama"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Izrađeno je izvješće o programskoj pogrešci"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvuk"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvuk i prenesi"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Prijenos"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Prenesi na GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dopuštenja"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvješće o programskoj pogrešci već se izrađuje"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Započelo je izvješćivanje o programskoj pogrešci"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"U tijeku je izrada izvješća o programskim pogreškama"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Započela je izrada izvješća o programskim pogreškama"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Izrada izvješća o programskoj pogrešci nije uspjela"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje zaslona nije uspjelo"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Snimanje stanja nije uspjelo"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U tijeku je izrada izvješća o programskoj pogrešci"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvješće o programskoj pogrešci je izrađeno"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Izrađeno je izvješće o programskim pogreškama"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izvješća o programskoj pogrešci"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-hu/strings.xml b/tests/BugReportApp/res/values-hu/strings.xml
index 01379ca..6a48b3a 100644
--- a/tests/BugReportApp/res/values-hu/strings.xml
+++ b/tests/BugReportApp/res/values-hu/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beszéljen, és írja le a problémát"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hangüzenet hozzáadása a hibajelentéshez (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Felvétel befejezve"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Már folyamatban van a hibajelentés begyűjtése"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"A hibajelentés folyamatban van"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A rendszerbe hibajelentés érkezett"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Hang hozzáadása"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Hang hozzáadása és feltöltés"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Feltöltés"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Feltöltés ide: GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Adja meg az engedélyeket"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Már folyamatban van a hibajelentés begyűjtése"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"A hibajelentés elkezdődött"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"A hibajelentés folyamatban van"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"A hibajelentés elkezdődött"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Sikertelen hibajelentés"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nem sikerült a képernyő rögzítése"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Kiírás állapota sikertelen"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Kiírás állapota sikertelen"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"A hibajelentés folyamatban van"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hibajelentés begyűjtve"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"A hibajelentés begyűjtése sikeresen megtörtént"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hibajelentés állapotcsatornája"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-hy/strings.xml b/tests/BugReportApp/res/values-hy/strings.xml
index fae2e3b..e39e460 100644
--- a/tests/BugReportApp/res/values-hy/strings.xml
+++ b/tests/BugReportApp/res/values-hy/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Բարձրաձայն նկարագրեք սխալը"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Վրիպակների մասին հաշվետվության վերաբերյալ ձայնային հաղորդագրություն, ժամը՝ %s։"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Գրանցումն ավարտվեց"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Վրիպակների մասին հաշվետվությունն արդեն բեռնվում է"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Վրիպակի մասին զեկույցը բեռնվում է"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Սխալի մասին զեկույցը բեռնվել է"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ավելացնել աուդիո"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ավելացնել աուդիո և վերբեռնել"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Վերբեռնել"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Վերբեռնել GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Տրամադրեք թույլտվություններ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Վրիպակների մասին հաշվետվությունն արդեն բեռնվել է"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Վրիպակների մասին հաղորդումը սկսված է"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Վրիպակի մասին զեկույցը բեռնվում է"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Վրիպակի մասին զեկույցը ստեղծվում է"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Վրիպակի զեկույցի հետ կապված սխալ առաջացավ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Չհաջողվեց ստեղծել սքրինշոթ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Գրանցման կարգավիճակի սխալ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate ծառայության սխալ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Վրիպակի մասին զեկույցը բեռնվում է"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Վրիպակի մասին զեկույցը բեռնվել է"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Վրիպակի մասին զեկույցը բեռնվել է"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Վրիպակի մասին զեկույցի կարգավիճակի ալիք"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-in/strings.xml b/tests/BugReportApp/res/values-in/strings.xml
index 2d76a43..230a1a9 100644
--- a/tests/BugReportApp/res/values-in/strings.xml
+++ b/tests/BugReportApp/res/values-in/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Ungkapkan &amp; Jelaskan Masalah"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Pesan audio untuk laporan bug pada %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Perekaman selesai"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Satu laporan bug siap dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Laporan bug sedang berlangsung"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Satu laporan bug telah dikumpulkan"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tambah Audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tambah Audio &amp; Upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload ke GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Harap beri izin"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan bug siap dikumpulkan"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pelaporan bug dimulai"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Laporan bug sedang berlangsung"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Laporan bug telah dimulai"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Laporan bug gagal"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot gagal"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Status dump gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Status dump gagal"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan bug sedang berlangsung"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan bug dikumpulkan"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Laporan bug telah diambil"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan bug"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-is/strings.xml b/tests/BugReportApp/res/values-is/strings.xml
index 2641eee..3352789 100644
--- a/tests/BugReportApp/res/values-is/strings.xml
+++ b/tests/BugReportApp/res/values-is/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Talaðu og lýstu vandamálinu"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hljóðskilaboð villutilkynningar kl. %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Skráningu lokið"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Þegar er verið að skrá villutilkynningu"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Verið er að útbúa villutilkynningu"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Villutilkynning var skráð"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Bæta við hljóði"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Bæta við hljóði og hlaða inn"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Hlaða inn"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Hlaða inn á GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Veittu heimildir"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Villutilkynning hefur þegar verið skráð"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Byrjað að tilkynna villu"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Verið er að útbúa villutilkynningu"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Villutilkynning er hafin"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Ekki tókst að útbúa villutilkynningu"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjámyndataka mistókst"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ekki tókst sækja stöðu"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate mistókst"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Verið er að útbúa villutilkynningu"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Villutilkynning skráð"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Búið er að sækja villutilkynningu"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Stöðurás villutilkynninga"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-it/strings.xml b/tests/BugReportApp/res/values-it/strings.xml
index fa508f9..8412e3b 100644
--- a/tests/BugReportApp/res/values-it/strings.xml
+++ b/tests/BugReportApp/res/values-it/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parla e descrivi il problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Messaggio audio per segnalazione di bug alle %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registrazione terminata"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"È già in corso la raccolta di una segnalazione di bug"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Segnalazione di bug in corso…"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"È stata raccolta una segnalazione di bug"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Aggiungi audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Aggiungi audio e carica"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Carica"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Carica su GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedi le autorizzazioni"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raccolta della segnalazione di bug già in corso"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Segnalazione di bug avviata"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Segnalazione di bug in corso…"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Segnalazione di bug iniziata"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Segnalazione di bug non riuscita"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Acquisizione schermata non riuscita"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump dello stato non riuscito"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Errore del servizio Dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Segnalazione di bug in corso"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Segnalazione di bug raccolta"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Segnalazione di bug raccolta"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canale stato segnalazione di bug"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-iw/strings.xml b/tests/BugReportApp/res/values-iw/strings.xml
index bb94591..2324ba1 100644
--- a/tests/BugReportApp/res/values-iw/strings.xml
+++ b/tests/BugReportApp/res/values-iw/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"דיבור ותיאור של הבעיה"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"הודעת האודיו בנושא הדוח על באג ב-%s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ההקלטה הסתיימה"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"כבר מתבצע איסוף של דוח על באג"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"הדוח על הבאג נמצא בתהליך"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"נאסף דוח על באג"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"הוספת אודיו"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"הוספת אודיו והעלאה"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"העלאה"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"העלאה אל GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"יש להעניק הרשאות"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"כבר מתבצע איסוף של דוח על באג"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"תהליך הדיווח על באג החל"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"הדוח על הבאג נמצא בתהליך"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"יצירת הדוח על הבאג החלה"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"נכשל דוח על באג"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"צילום מסך נכשל"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"נכשל מצב Dump"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"מצב Dump נכשל"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"דוח על באג נמצא בתהליך"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"מתבצע איסוף של דוח על באג"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"הדוח על הבאג נאסף"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ערוץ סטטוס של דוח על באג"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ja/strings.xml b/tests/BugReportApp/res/values-ja/strings.xml
index afc40a5..0d4ef1b 100644
--- a/tests/BugReportApp/res/values-ja/strings.xml
+++ b/tests/BugReportApp/res/values-ja/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"問題の説明"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"バグレポート(%s)の音声メッセージ"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"録画を終了しました"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"バグレポートの収集はすでに開始しています"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"バグレポートを収集しています"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"バグレポートを収集しました"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"音声を追加"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"音声を追加してアップロード"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"アップロード"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS にアップロード"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"権限を付与してください"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"バグレポートの収集はすでに開始しています"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"バグレポートを開始しました"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"バグレポートを収集しています"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"バグレポートの収集を開始しました"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"バグレポートを収集できませんでした"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"画面をキャプチャできませんでした"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ステータスをダンプできませんでした"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate を実行できませんでした"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"バグレポートを収集しています"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"バグレポートを収集しました"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"バグレポートを収集しました"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"バグレポート ステータス チャンネル"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ka/strings.xml b/tests/BugReportApp/res/values-ka/strings.xml
index cdc732e..6263be1 100644
--- a/tests/BugReportApp/res/values-ka/strings.xml
+++ b/tests/BugReportApp/res/values-ka/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ისაუბრეთ და აღწერეთ პრობლემა"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"სისტემის ხარვეზის ანგარიშის აუდიო შეტყობინება %s-ზე"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ჩაწერა დასრულდა"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"სისტემის ხარვეზის ანგარიში უკვე მზადდება"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"მიმდინარეობს სისტემის ხარვეზის ანგარიშის მომზადება"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"სისტემის ხარვეზის ანგარიში მომზადდა"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"აუდიოს დამატება"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"აუდიოს დამატება და ატვირთვა"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ატვირთვა"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-ზე ატვირთვა"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"გთხოვთ მისცეთ უფლებები"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"სისტემის ხარვეზის ანგარიში უკვე მომზადდა"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"სისტემის ხარვეზის ანგარიშის გაგზავნა დაიწყო"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"მიმდინარეობს სისტემის ხარვეზის ანგარიშის მომზადება"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"სისტემის ხარვეზის ანგარიშის მომზადება დაიწყო"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"სისტემის ხარვეზის ანგარიში ვერ მომზადდა"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ეკრანის აღბეჭდვა ვერ მოხერხდა"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ჩაწერის მდგომარეობა შეფერხდა"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate შეფერხდა"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"მიმდინარეობს სისტემის ხარვეზის ანგარიშის მომზადება"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"სისტემის ხარვეზის ანგარიში მომზადებულია"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"სისტემის ხარვეზის ანგარიში მიღებულია"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"სისტემის ხარვეზის ანგარიშის სტატუსის არხი"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-kk/strings.xml b/tests/BugReportApp/res/values-kk/strings.xml
index f78cf0f..5a5eb17 100644
--- a/tests/BugReportApp/res/values-kk/strings.xml
+++ b/tests/BugReportApp/res/values-kk/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Қатені ауызша сипаттап беріңіз"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Қате туралы есептің аудиохабары (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жазу аяқталды."</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Қате туралы есеп әлдеқашан алынып жатыр"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Қате туралы есеп алынды"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудиохабар енгізу"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудиохабар енгізу және жүктеп салу"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Жүктеп салу"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS серверіне жүктеп салу"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Рұқсаттар беріңіз."</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Қате туралы есеп әлдеқашан алынып жатыр."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Қате туралы есеп жүктелуде"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"Қате туралы есеп алынбады."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Скриншот түсірілмеді."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Дамп күйі алынбады."</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Қате туралы есеп алынуда"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Қате туралы есеп алынды"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Қате туралы есеп арнасы"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-km/strings.xml b/tests/BugReportApp/res/values-km/strings.xml
index a7b95b8..d664b58 100644
--- a/tests/BugReportApp/res/values-km/strings.xml
+++ b/tests/BugReportApp/res/values-km/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"និយាយ និង​រៀបរាប់​អំពី​បញ្ហា"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"សារជាសំឡេង​សម្រាប់របាយការណ៍​អំពីបញ្ហានៅម៉ោង %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"បាន​បញ្ចប់​ការថត​ហើយ"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ការរាយការណ៍​អំពី​បញ្ហាកំពុងដំណើរការ"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"បានប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ហើយ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"បញ្ចូល​សំឡេង"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"បញ្ចូល​សំឡេង និងបង្ហោះ"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"បង្ហោះ"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"បង្ហោះ​ទៅ GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"សូម​ផ្ដល់​ការ​អនុញ្ញាត"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ការរាយការណ៍​អំពីបញ្ហាត្រូវ​បានចាប់ផ្ដើម"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ការរាយការណ៍​អំពី​បញ្ហាកំពុងដំណើរការ"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"បានចាប់ផ្ដើមការរាយការណ៍​អំពី​បញ្ហា"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"មិនអាច​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​បានទេ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"មិន​អាច​ថត​អេក្រង់​បានទេ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"មិនអាច​ប្រមូល​ស្ថិតិ​បានទេ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate ​ដំណើរការមិនបានសម្រេចទេ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"របាយការណ៍​អំពី​បញ្ហា​ត្រូវបាន​ប្រមូល"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"បានប្រមូលរបាយការណ៍អំពីបញ្ហា"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"បណ្ដាញ​ស្ថានភាព​នៃ​របាយការណ៍​អំពី​បញ្ហា"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-kn/strings.xml b/tests/BugReportApp/res/values-kn/strings.xml
index 8149343..77e563c 100644
--- a/tests/BugReportApp/res/values-kn/strings.xml
+++ b/tests/BugReportApp/res/values-kn/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ಸಮಸ್ಯೆಯ ಕುರಿತು ಮಾತನಾಡಿ ಮತ್ತು ವಿವರಿಸಿ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ನಲ್ಲಿ ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆಗಾಗಿ ಆಡಿಯೊ ಸಂದೇಶ"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ರೆಕಾರ್ಡಿಂಗ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ಆಡಿಯೊವನ್ನು ಸೇರಿಸಿ"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ಆಡಿಯೊವನ್ನು ಸೇರಿಸಿ ಮತ್ತು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS ಗೆ ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"ಅನುಮತಿಗಳನ್ನು ನೀಡಿ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ಸ್ಕ್ರೀನ್ ಕ್ಯಾಪ್ಚರ್ ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ಡಂಪ್ ಸ್ಥಿತಿ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ಡಂಪ್‌ಸ್ಟೇಟ್ ವಿಫಲವಾಗಿದೆ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಸ್ಥಿತಿ ಚಾನಲ್"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ko/strings.xml b/tests/BugReportApp/res/values-ko/strings.xml
index 6162aae..ae1d65f 100644
--- a/tests/BugReportApp/res/values-ko/strings.xml
+++ b/tests/BugReportApp/res/values-ko/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"문제 말하기 및 설명하기"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"버그 신고용 음성 메시지가 %s에 등록되었습니다."</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"녹음 완료"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"이미 버그 신고를 수집하는 중"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"버그 신고 진행 중"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"버그 신고가 수집됨"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"오디오 추가"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"오디오 추가 및 업로드"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"업로드"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS로 업로드"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"권한을 부여해 주세요."</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"이미 버그 신고를 수집하는 중입니다."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"버그 신고를 시작했습니다."</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"버그 신고 진행 중"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"버그 신고 시작됨"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"버그 신고 실패"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"화면 캡처에 실패했습니다."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"dumpstate에 실패했습니다."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate 실패"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"버그 신고가 진행 중입니다."</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"버그 신고가 수집됨"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"버그 신고 접수됨"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"버그 신고 상태 채널"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ky/strings.xml b/tests/BugReportApp/res/values-ky/strings.xml
index de9b68e..4bb26fb 100644
--- a/tests/BugReportApp/res/values-ky/strings.xml
+++ b/tests/BugReportApp/res/values-ky/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Маселени сүрөттөп бериңиз"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Саат %s мүчүлүштүк тууралуу кабардын аудио билдирүүсү"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жаздырылып бүттү"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Мүчүлүштүк тууралуу кабар алынган"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Мүчүлүштүк тууралуу кабар даярдалууда"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Мүчүлүштүк тууралуу кабар алынды"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудио билдирүү кошуу"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудио билдирүү кошуп, жүктөп берүү"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Жүктөп берүү"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'ке жүктөп берүү"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Уруксаттарды бериңиз"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Мүчүлүштүк тууралуу кабар алынган"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Мүчүлүштүк тууралуу кабар берилип баштады"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Мүчүлүштүк тууралуу кабар даярдалууда"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Мүчүлүштүк тууралуу кабар даярдалып баштады"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Мүчүлүштүк тууралуу кабар берилген жок"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Экран тартылып алынган жок"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Абал тууралуу маалымат алынган жок"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Абал тууралуу маалымат алынган жок"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Мүчүлүштүк тууралуу кабар даярдалууда"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Мүчүлүштүк тууралуу кабар алынды"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Мүчүлүштүк тууралуу кабар даярдалды"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Мүчүлүштүк тууралуу кабарлоо абалынын каналы"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-lo/strings.xml b/tests/BugReportApp/res/values-lo/strings.xml
index 57d0d82..9161712 100644
--- a/tests/BugReportApp/res/values-lo/strings.xml
+++ b/tests/BugReportApp/res/values-lo/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ເວົ້າ ແລະ ອະທິບາຍບັນຫາ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"ຂໍ້ຄວາມສຽງສຳລັບລາຍງານບັນຫາເມື່ອ %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ສຳເລັດການບັນທຶກແລ້ວ"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ກຳລັງເກັບກຳລາຍງານບັນຫາ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ເພີ່ມສຽງ"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ເພີ່ມສຽງ ແລະ ອັບໂຫຼດ"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ອັບໂຫລດ"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"ອັບໂຫຼດໃສ່ GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"ກະລຸນາໃຫ້ການອະນຸຍາດ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ເລີ່ມການລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"ເລີ່ມລາຍງານຂໍ້ຜິດພາດແລ້ວ"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ລາຍງານບັນຫາບໍ່ສຳເລັດ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ບັນທຶກພາບໜ້າຈໍບໍ່ສຳເລັດ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ດຳສະເຕດບໍ່ສຳເລັດ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ດຳສະເຕດບໍ່ສຳເລັດ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"ເກັບກຳລາຍງານຂໍ້ຜິດພາດແລ້ວ"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ຊ່ອງທາງຂອງສະຖານະລາຍງານບັນຫາ"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-lt/strings.xml b/tests/BugReportApp/res/values-lt/strings.xml
index 6b5dd33..c5651bb 100644
--- a/tests/BugReportApp/res/values-lt/strings.xml
+++ b/tests/BugReportApp/res/values-lt/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kalbėkite ir apibūdinkite problemą"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Garso pranešimas apie riktą: %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Įrašymas baigtas"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Pranešimas apie riktą jau gaunamas"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Pranešimas apie riktą vykdomas"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Gautas pranešimas apie riktą"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pridėti garso įrašą"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pridėti garso įrašą ir įkelti"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Įkelti"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Įkelti į GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Suteikite leidimus"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Pranešimas apie riktą jau gaunamas"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pranešimo apie riktą procesas pradėtas"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Pranešimas apie riktą vykdomas"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Pradėtas kurti pranešimas apie riktą"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Nepavyko gauti pranešimo apie riktą"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepavyko užfiksuoti ekrano"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepavyko pateikti atminties išklotinės"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Nepavyko pateikti atminties išklotinės"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Pranešimas apie riktą vykdomas"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Pranešimas apie riktą gautas"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Pranešimas apie riktą gautas"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Pranešimo apie riktą kanalas"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-lv/strings.xml b/tests/BugReportApp/res/values-lv/strings.xml
index fe21bd7..3352dc1 100644
--- a/tests/BugReportApp/res/values-lv/strings.xml
+++ b/tests/BugReportApp/res/values-lv/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Runājiet un raksturojiet problēmu"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio ziņojums kļūdas pārskatam (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ierakstīšana pabeigta"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Kļūdas pārskats jau tiek iegūts"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Notiek kļūdas pārskata izveide…"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kļūdas pārskats ir iegūts"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pievienot audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pievienot audio un augšupielādēt"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Augšupielādēt"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Augšupielādēt GCS krātuvē"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Lūdzu, piešķiriet atļaujas"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kļūdas pārskats jau tiek iegūts."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Sākta kļūdas pārskata izveide."</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Notiek kļūdas pārskata izveide…"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Ir sākta kļūdas pārskata izveide."</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Neizdevās izveidot kļūdas pārskatu."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Neizdevās veikt ekrānuzņēmumu."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Neizdevās iegūt sistēmas datus un statusu."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Pakalpojuma Dumpstate kļūme."</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kļūdas pārskats tiek veidots."</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Kļūdas pārskats ir iegūts"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Kļūdas pārskats ir izveidots."</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kļūdas pārskata statusa kanāls"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-mk/strings.xml b/tests/BugReportApp/res/values-mk/strings.xml
index 9681a1b..49a5a1d 100644
--- a/tests/BugReportApp/res/values-mk/strings.xml
+++ b/tests/BugReportApp/res/values-mk/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Зборувајте и објаснете го проблемот"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудиопорака за извештај за грешка на %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимањето заврши"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Веќе се собира извештај за грешка"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Во тек е извештај за грешка"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Собран е извештај за грешка"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додај аудио"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додај аудио и прикачи"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Прикачи"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Прикачи на GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозвола"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Веќе се собира извештај за грешка"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Пријавувањето грешка започна"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Во тек е извештај за грешка"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Извештајот за грешка е започнат"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Извештајот за грешка не успеа"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимањето на екранот не успеа"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Состојбата на меморијата не успеа"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Состојбата на меморијата не успеа"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Во тек е извештај за грешка"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештајот за грешка е собран"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Го прибравме извештајот за грешка"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за статус на извештајот за грешка"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ml/strings.xml b/tests/BugReportApp/res/values-ml/strings.xml
index e00f964..3fdc500 100644
--- a/tests/BugReportApp/res/values-ml/strings.xml
+++ b/tests/BugReportApp/res/values-ml/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"പ്രശ്‌നം പറഞ്ഞ് വിവരിക്കുക"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s-നുള്ള ബഗ് റിപ്പോർട്ടിന്റെ ഓഡിയോ സന്ദേശം"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"റെക്കോർഡ് ചെയ്യൽ പൂർത്തിയായി"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ഒരു ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ഒരു ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചിട്ടുണ്ട്"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ഓഡിയോ ചേർക്കുക"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ഓഡിയോ ചേർത്ത് അപ്‌ലോഡ് ചെയ്യുക"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"അപ്‌ലോഡ് ചെയ്യുക"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-ലേക്ക് അപ്‌ലോഡ് ചെയ്യുക"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"അനുമതികൾ നൽകുക"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ബഗ് റിപ്പോർട്ട് ചെയ്യൽ ആരംഭിച്ചു"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"ബഗ് റിപ്പോർട്ട് ആരംഭിച്ചു"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ബഗ് റിപ്പോർട്ട് ചെയ്യാനായില്ല"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"സ്ക്രീനിന്റെ ചിത്രമെടുക്കാനായില്ല"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ഡംപ് സ്റ്റേറ്റ് ചെയ്യാനായില്ല"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ഡംപ്സ്റ്റേറ്റ് റൺ ചെയ്യാനായില്ല"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചു"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചു"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ബഗ് റിപ്പോർട്ട് സ്റ്റാറ്റസ് ചാനൽ"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-mn/strings.xml b/tests/BugReportApp/res/values-mn/strings.xml
index cd503a7..620097c 100644
--- a/tests/BugReportApp/res/values-mn/strings.xml
+++ b/tests/BugReportApp/res/values-mn/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Асуудлыг ярих болон тайлбарлах"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s-н алдааны мэдээний аудио мессеж"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Дуу хурааж дууслаа"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Алдааны мэдээг цуглуулж байна"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Алдааны мэдээг цуглууллаа"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудио нэмэх"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудио нэмэх &amp; Байршуулах"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Байршуулах"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-д байршуулах"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Зөвшөөрөл олгоно уу"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Алдааны мэдээг эхлүүлсэн"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Алдааны мэдээг цуглуулж байна"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Алдааны мэдээг эхлүүлсэн"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Алдааны мэдээг цуглуулж чадсангүй"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Дэлгэцийн зургийг авч чадсангүй"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state амжилтгүй боллоо"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate амжилтгүй боллоо"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Алдааны мэдээг цуглуулж байна"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Алдааны мэдээг цуглуулсан"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Алдааны мэдээг цуглууллаа"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Алдааны мэдээний төлөвийн суваг"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-mr/strings.xml b/tests/BugReportApp/res/values-mr/strings.xml
index c69f650..20dda8d 100644
--- a/tests/BugReportApp/res/values-mr/strings.xml
+++ b/tests/BugReportApp/res/values-mr/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलून समस्येचे वर्णन करा"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"बग रिपोर्टचा ऑडिओ मेसेज %s वाजता आला"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकॉर्ड करणे पूर्ण झाले आहे"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"बग रिपोर्ट आधीच गोळा केला गेला आहे"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट गोळा केला गेला आहे"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ऑडिओ जोडा"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ऑडिओ जोडा आणि अपलोड करा"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड करा"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS वर अपलोड करा"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया परवानगी द्या"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट आधीपासून गोळा केला जात आहे"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"बग रिपोर्टिंग सुरू केले आहे"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"बग रिपोर्ट तयार करणे सुरू झाले आहे"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट तयार करता आला नाही"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कॅप्चर करता आली नाही"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप स्थितीवर बदलता आले नाही"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"डंपस्टेट अयशस्‍वी झाली"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट गोळा केला"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"बग रिपोर्ट गोळा केला गेला आहे"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्ट स्थिती चॅनल"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ms/strings.xml b/tests/BugReportApp/res/values-ms/strings.xml
index 5e77e6b..c435ab8 100644
--- a/tests/BugReportApp/res/values-ms/strings.xml
+++ b/tests/BugReportApp/res/values-ms/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Sebut &amp; Terangkan Isu Tersebut"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesej audio untuk pelaporan pepijat pada %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Rakaman selesai"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Laporan pepijat sudah dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Laporan pepijat sedang berjalan"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Laporan pepijat telah dikumpulkan"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tambah Audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tambah Audio &amp; Muat Naik"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Muat naik"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Muat naik ke GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Sila beri kebenaran"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan pepijat sudah dikumpulkan"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pelaporan pepijat dimulakan"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Laporan pepijat sedang berjalan"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Laporan pepijat bermula"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Laporan pepijat gagal"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Tangkapan skrin gagal"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Keadaan longgokan gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Keadaan longgokan gagal"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan pepijat sedang berjalan"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan pepijat dikumpulkan"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Laporan pepijat telah dikumpulkan"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan pepijat"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-my/strings.xml b/tests/BugReportApp/res/values-my/strings.xml
index 0d7b693..36eaf80 100644
--- a/tests/BugReportApp/res/values-my/strings.xml
+++ b/tests/BugReportApp/res/values-my/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ပြဿနာကို စကားပြော၍ ဖော်ပြပါ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ၌ ပြုလုပ်ခဲ့သည့် ချွတ်ယွင်းမှု အစီရင်ခံချက်အတွက် အသံမက်ဆေ့ဂျ်"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"အသံသွင်းပြီးသွားပါပြီ"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပါပြီ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ချွတ်ယွင်းမှု တိုင်ကြားချက်ကို ဆောင်ရွက်နေဆဲဖြစ်သည်"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"အသံထည့်ရန်"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"အသံထည့်ပြီး အပ်လုဒ်လုပ်ရန်"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"အပ်လုဒ်လုပ်ရန်"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS သို့ အပ်လုဒ်လုပ်ရန်"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"ခွင့်ပြုချက်များ ပေးပါ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပြီး ဖြစ်သည်"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ချွတ်ယွင်းမှု အစီရင်ခံချက်ကို စတင်လိုက်ပါပြီ"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ချွတ်ယွင်းမှု တိုင်ကြားချက်ကို ဆောင်ရွက်နေဆဲဖြစ်သည်"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"ချွတ်ယွင်းမှု တိုင်ကြားချက်ကို စတင်ထားသည်"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ချွတ်ယွင်းမှု အစီရင်ခံ၍မရပါ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"မျက်နှာပြင် ပုံဖမ်း၍ မရပါ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state မအောင်မြင်ပါ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate မအောင်မြင်ပါ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို ဆောင်ရွက်နေဆဲဖြစ်သည်"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"ချွတ်ယွင်းမှု တိုင်ကြားချက်ကို စုစည်းပြီးပြီ"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ချွတ်ယွင်းမှု အစီရင်ခံချက် အခြေအနေ ချန်နယ်"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-nb/strings.xml b/tests/BugReportApp/res/values-nb/strings.xml
index 4aa225a..27e450f 100644
--- a/tests/BugReportApp/res/values-nb/strings.xml
+++ b/tests/BugReportApp/res/values-nb/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Les opp og beskriv problemet"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Lydmelding for feilrapporten klokken %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opptaket er fullført"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En feilrapport blir allerede samlet inn"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"En feilrapport pågår"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En feilrapport er samlet inn"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Legg til lyd"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Legg til lyd og last opp"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Last opp"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Last opp til GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Gi tillatelser"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"En feilrapport blir allerede samlet inn"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Rapporteringen av feil er startet"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"En feilrapport pågår"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"En feilrapport er startet"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Feilrapporten mislyktes"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjermdumpen mislyktes"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumptilstand mislyktes"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumptilstand mislyktes"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"En feilrapport pågår"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"En feilrapport samles inn"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"En feilrapport er samlet inn"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for feilrapport"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ne/strings.xml b/tests/BugReportApp/res/values-ne/strings.xml
index 5114772..dcda57e 100644
--- a/tests/BugReportApp/res/values-ne/strings.xml
+++ b/tests/BugReportApp/res/values-ne/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलेर समस्याको वर्णन गर्नुहोस्"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s बजे बग रिपोर्टसम्बन्धी अडियो सन्देश"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकर्ड गर्ने कार्य पूरा भयो"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"एउटा बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"त्रुटिसम्बन्धी रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट सङ्कलन गरिएको छ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"अडियो थप्नुहोस्"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"अडियो थप्नुहोस् तथा अपलोड गर्नुहोस्"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड गर्नुहोस्"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS मा अपलोड गर्नुहोस्"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दिनुहोस्"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"बगबारे रिपोर्ट गर्ने कार्य सुरु भयो"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"त्रुटिसम्बन्धी रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"त्रुटिसम्बन्धी रिपोर्ट सङ्कलन गर्न थालिएको छ"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट सङ्कलन गर्न सकिएन"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रिनको फोटो खिच्न सकिएन"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डम्प स्टेटले काम गर्न सकेन"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate ले काम गर्न सकेन"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट सङ्कलन गरियो"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"त्रुटिसम्बन्धी रिपोर्ट सङ्कलन गरिएको छ"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्टको स्थिति देखाउने च्यानल"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-nl/strings.xml b/tests/BugReportApp/res/values-nl/strings.xml
index b893a19..2ee0f31 100644
--- a/tests/BugReportApp/res/values-nl/strings.xml
+++ b/tests/BugReportApp/res/values-nl/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Spreek en beschrijf het probleem"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audiobericht voor bugrapportage om %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname gestopt"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Er wordt al een bugrapport verzameld"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Bugrapport wordt uitgevoerd"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Er is een bugrapport verzameld"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio toevoegen"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio toevoegen en uploaden"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Uploaden"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Uploaden naar GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Verleen rechten"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bugrapport wordt al verzameld"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bugrapportage is gestart"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Bugrapport wordt uitgevoerd"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bugrapport is gestart"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Bugrapport is mislukt"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot maken is mislukt"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumpstatus mislukt"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstatus mislukt"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bugrapport wordt uitgevoerd"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bugrapport wordt verzameld"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bugrapport is verzameld"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanaal voor bugrapportstatus"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-or/strings.xml b/tests/BugReportApp/res/values-or/strings.xml
index 678830d..79ce668 100644
--- a/tests/BugReportApp/res/values-or/strings.xml
+++ b/tests/BugReportApp/res/values-or/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ସମସ୍ୟା କୁହନ୍ତୁ ଏବଂ ବ୍ୟାଖ୍ୟା କରନ୍ତୁ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%sରେ ବଗ୍ ରିପୋର୍ଟ ପାଇଁ ଅଡିଓ ମେସେଜ୍"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ରେକର୍ଡିଂ ସମାପ୍ତ ହୋଇଛି"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ଏକ ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"ବଗ ରିପୋର୍ଟ କରିବା ପ୍ରକ୍ରିୟା ଚାଲିଛି"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ଏକ ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ଅଡିଓ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ଅଡିଓ ଯୋଗ କରନ୍ତୁ ଓ ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSରେ ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"ଦୟାକରି ଅନୁମତି ଅନୁମୋଦନ କରନ୍ତୁ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗୃହିତ ହୋଇଛି"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ବଗ୍ ରିପୋର୍ଟିଂ ଆରମ୍ଭ ହୋଇଛି"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"ବଗ ରିପୋର୍ଟ କରିବା ପ୍ରକ୍ରିୟା ଚାଲିଛି"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"ବଗ ରିପୋର୍ଟ କରିବା ପ୍ରକ୍ରିୟା ଆରମ୍ଭ କରାଯାଇଛି"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"ବଗ୍ ରିପୋର୍ଟ ବିଫଳ ହୋଇଛି"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ସ୍କ୍ରିନ୍ କ୍ୟାପ୍‍ଚର୍ ବିଫଳ ହୋଇଛି"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ଡମ୍ପ ଷ୍ଟେଟ୍ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ଡମ୍ପଷ୍ଟେଟ ବିଫଳ ହୋଇଛି"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ବଗ୍ ରିପୋର୍ଟ ଜାରି ଅଛି"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"ବଗ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ବଗ୍ ରିପୋର୍ଟ ସ୍ଥିତି ଚ୍ୟାନେଲ୍"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-pa/strings.xml b/tests/BugReportApp/res/values-pa/strings.xml
index 3d34363..1787ad5 100644
--- a/tests/BugReportApp/res/values-pa/strings.xml
+++ b/tests/BugReportApp/res/values-pa/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ਬੋਲ ਕੇ ਸਮੱਸਿਆ ਦਾ ਵਰਣਨ ਕਰੋ"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ’ਤੇ ਬੱਗ ਰਿਪੋਰਟ ਲਈ ਆਡੀਓ ਸੁਨੇਹਾ"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ਰਿਕਾਰਡਿੰਗ ਪੂਰੀ ਹੋ ਗਈ"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ਆਡੀਓ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ਆਡੀਓ ਸ਼ਾਮਲ ਕਰਕੇ ਅੱਪਲੋਡ ਕਰੋ"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ਅੱਪਲੋਡ ਕਰੋ"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS \'ਤੇ ਅੱਪਲੋਡ ਕਰੋ"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"ਕਿਰਪਾ ਕਰਕੇ ਇਜਾਜ਼ਤਾਂ ਦਿਓ"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਗਈ ਹੈ"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"ਬੱਗ ਦੀ ਰਿਪੋਰਟਿੰਗ ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ਸਕ੍ਰੀਨ ਨੂੰ ਕੈਪਚਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ਡੰਪ ਸਥਿਤੀ ਅਸਫਲ ਰਹੀ"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਜਾਰੀ ਹੈ"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਸਥਿਤੀ ਸੰਬੰਧੀ ਚੈਨਲ"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-pl/strings.xml b/tests/BugReportApp/res/values-pl/strings.xml
index 052665a..c4cc073 100644
--- a/tests/BugReportApp/res/values-pl/strings.xml
+++ b/tests/BugReportApp/res/values-pl/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Opowiedz nam o tym problemie"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Wiadomość głosowa dotycząca zgłoszenia błędu z %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukończono rejestrowanie"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dane do raportu o błędzie są już zbierane"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Trwa zgłaszanie błędu"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zebrano dane do raportu o błędzie"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj wiadomość głosową"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj wiadomość głosową i prześlij"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Prześlij"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Prześlij do GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Przyznaj uprawnienia"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dane do raportu o błędzie są już zbierane"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Rozpoczęło się zgłaszanie błędu"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Trwa zgłaszanie błędu"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Rozpoczęto zgłaszanie błędu"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Nie udało się zgłosić błędu"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nie udało się przechwycić zawartości ekranu"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nie udało się utworzyć zrzutu stanu"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Nie udało się utworzyć zrzutu stanu"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Trwa zgłaszanie błędu"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Dane do raportu o błędzie zostały zebrane"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Zgłoszono błąd"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanał stanu zgłaszania błędu"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-pt-rPT/strings.xml b/tests/BugReportApp/res/values-pt-rPT/strings.xml
index a9dfbae..7d8d6c7 100644
--- a/tests/BugReportApp/res/values-pt-rPT/strings.xml
+++ b/tests/BugReportApp/res/values-pt-rPT/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensagem de áudio do relatório de erro à(s) %s."</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída."</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Já está a ser recolhido um relatório de erro"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"O relatório de erro está em curso"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Foi recolhido um relatório de erro"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adicionar áudio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adicionar áudio e carregar"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Carregar"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Carregar para o GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda as autorizações."</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Já está a ser recolhido um relatório de erro."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"A criação do relatório de erro foi iniciada."</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"O relatório de erro está em curso"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"O relatório de erro teve início"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório de erro."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao efetuar a captura de ecrã."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha do estado de captura."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Falha do estado de captura"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório de erro está em curso."</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório de erro foi recolhido"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"O relatório de erro foi recolhido"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal do estado do relatório de erro"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-pt/strings.xml b/tests/BugReportApp/res/values-pt/strings.xml
index 0d872a7..1b0b7fc 100644
--- a/tests/BugReportApp/res/values-pt/strings.xml
+++ b/tests/BugReportApp/res/values-pt/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensagem de áudio para o relatório do bug às %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Um relatório do bug já está sendo coletado"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"O relatório do bug está em progresso"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Um relatório do bug foi coletado"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adicionar áudio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adicionar áudio e fazer upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Fazer upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Fazer upload para o GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda permissões"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"O relatório do bug já sendo coletado"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"A geração do relatório do bug foi iniciada"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"O relatório do bug está em progresso"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"O relatório do bug foi iniciado"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório do bug"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao capturar a tela"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha no estado de despejo"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Falha no dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório do bug está em progresso"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório do bug foi coletado"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"O relatório do bug foi coletado"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de status do relatório do bug"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ro/strings.xml b/tests/BugReportApp/res/values-ro/strings.xml
index 435869b..490a056 100644
--- a/tests/BugReportApp/res/values-ro/strings.xml
+++ b/tests/BugReportApp/res/values-ro/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Vorbiți și descrieți problema"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesaj audio pentru raportul de eroare la %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Înregistrarea s-a încheiat"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Se colectează deja un raport de eroare"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Raportul de eroare este în curs"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S-a colectat un raport de eroare"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adăugați conținut audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adăugați conținut audio și încărcați"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Încărcați"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Încărcați în GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Acordați permisiuni"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Se colectează deja raportul de eroare"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"A fost inițiată raportarea erorilor"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Raportul de eroare este în curs"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Raportul de eroare a fost inițiat"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Raportul de eroare nu s-a realizat"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Captura de ecran nu a reușit"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nu s-a preluat starea fișierului dump"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Nu s-a preluat starea fișierului dump"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raportul de eroare este în curs"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se colectează raportul de eroare"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Raportul de eroare a fost colectat"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canalul de stare a raportului de eroare"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ru/strings.xml b/tests/BugReportApp/res/values-ru/strings.xml
index 479c80e..89f4e95 100644
--- a/tests/BugReportApp/res/values-ru/strings.xml
+++ b/tests/BugReportApp/res/values-ru/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Опишите ошибку вслух"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудио для отчета об ошибке (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запись завершена."</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Отчет об ошибке уже загружается"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Отчет об ошибке загружается…"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Отчет об ошибке загружен."</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Добавить аудио"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Добавить и загрузить аудио"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Загрузить"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Загрузить в GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Предоставьте разрешения."</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Отчет об ошибке уже загружается."</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Выполняется загрузка отчета об ошибке."</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Отчет об ошибке загружается…"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Создается отчет об ошибке…"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Произошла ошибка."</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не удалось сделать скриншот."</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ошибка дампа состояния."</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Ошибка сервиса Dumpstate."</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Отчет об ошибке загружается…"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Отчет об ошибке загружен"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Отчет об ошибке загружен"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса отчета об ошибке"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-si/strings.xml b/tests/BugReportApp/res/values-si/strings.xml
index 994f997..3ac291a 100644
--- a/tests/BugReportApp/res/values-si/strings.xml
+++ b/tests/BugReportApp/res/values-si/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"ගැටලුව ගැන කථා කර විස්තර කරන්න"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s හිදී දෝෂ වාර්තාව සඳහා ශ්‍රව්‍ය පණිවිඩය"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"පටිගත කිරීම අවසන් විය"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"දෝෂ වාර්තාවක් දැනටමත් එක් කෙරෙමින් පවතියි"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"දෝෂ වාර්තාව ප්‍රගතියේ පවතියි"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"දෝෂ වාර්තාවක් එකතු කර ඇත"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ශ්‍රව්‍ය එක් කරන්න"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ශ්‍රව්‍ය එක් කර උඩුගත කරන්න"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"උඩුගත කරන්න"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS වෙත උඩුගත කරන්න"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"අවසර දෙන්න"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"දෝෂ වාර්තාව දැනටමත් එක් කෙරෙමින් පවතියි"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"දෝෂ වාර්තා කිරීම ඇරඹිණි"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"දෝෂ වාර්තාව ප්‍රගතියේ පවතියි"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"දෝෂ වර්තාව ආරම්භ විය"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"දෝෂ වාර්තාව අසාර්ථකයි"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"තිර ග්‍රහණය අසාර්ථකයි"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"නික්‍ෂේප තත්ත්‍වය අසාර්ථකයි"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ඩම්ප්ස්ටේට් අසාර්ථක විය"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"දෝෂ වාර්තාව ප්‍රගතියේ පවතියි"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"දෝෂ වාර්තාව එක් කෙරේ"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"දෝෂ වාර්තාව ලබා ගෙන ඇත"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"දෝෂ වාර්තා තත්ත්‍ව නාලිකාව"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sk/strings.xml b/tests/BugReportApp/res/values-sk/strings.xml
index a13406c..1af046d 100644
--- a/tests/BugReportApp/res/values-sk/strings.xml
+++ b/tests/BugReportApp/res/values-sk/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hovorte a opíšte problém"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvuková správa pre hlásenie chyby o %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávanie bolo dokončené"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Hlásenie chyby sa už získava"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Nahlasuje sa chyba"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bolo prijaté hlásenie chyby"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pridať zvuk"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pridať zvuk a nahrať"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Nahrať"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Nahrať do GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Udeľte povolenia"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hlásenie chyby už bolo získané"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hlásenie chyby bolo spustené"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Nahlasuje sa chyba"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Bolo spustené hlásenie chyby"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Hlásenie chyby zlyhalo"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepodarilo sa vytvoriť snímku obrazovky"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepodarilo sa obnoviť stav zo zálohy"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Nepodarilo sa obnoviť stav zo zálohy"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Prebieha hlásenie chyby"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Prebieha získavanie hlásenia chyby"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Bola nahlásená chyba"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu hlásenia chyby"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sl/strings.xml b/tests/BugReportApp/res/values-sl/strings.xml
index 6c8368f..27f650b 100644
--- a/tests/BugReportApp/res/values-sl/strings.xml
+++ b/tests/BugReportApp/res/values-sl/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite in opišite težavo"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvočno sporočilo za poročilo o napakah pri %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snemanje je dokončano"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Poročilo o napakah se že zbira"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Poročilo o napakah je zbrano"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvok"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvok in naloži"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Naloži"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Naloži v GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dovoljenja"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Poročilo o napakah se že zbira"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Poročanje o napakah se je začelo"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"Ustvarjanje poročila o napakah ni uspelo"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Zajemanje zaslona ni uspelo"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Izvoz stanja ni uspel"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Poročilo o napakah se ustvarja"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Poročilo o napakah je zbrano"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanala stanja poročila o napakah"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sq/strings.xml b/tests/BugReportApp/res/values-sq/strings.xml
index 4f96081..ee33f90 100644
--- a/tests/BugReportApp/res/values-sq/strings.xml
+++ b/tests/BugReportApp/res/values-sq/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fol dhe përshkruaj problemin"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesazh me audio për defektin në kod në %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Regjistrimi përfundoi"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Një raport i defekteve në kod po merret tashmë"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Raporti i defekteve në kod është në vazhdim"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Është marrë një raport i defekteve në kod"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Shto audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Shto audio dhe ngarko"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Ngarko"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Ngarko në GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Jep lejet"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raporti i defekteve në kod është marrë tashmë"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Filloi raportimi për defektin në kod"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Raporti i defekteve në kod është në vazhdim"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Raporti i defekteve në kod filloi"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Raporti i defekteve në kod dështoi"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Regjistrimi i ekranit dështoi"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Gjendja e mbledhjes dështoi"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Gjendja e mbledhjes dështoi"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raporti i defekteve në kod është në vazhdim"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Raporti i defekteve në kod u mor"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Raporti i defekteve në kod është mbledhur"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanali i statusit të raportit të defekteve në kod"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sr/strings.xml b/tests/BugReportApp/res/values-sr/strings.xml
index b77f27c..7c49841 100644
--- a/tests/BugReportApp/res/values-sr/strings.xml
+++ b/tests/BugReportApp/res/values-sr/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Изговорите и објасните проблем"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудио порука за извештај о грешци у %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимање је завршено"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Извештај о грешци се већ прикупља"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"У току је прављење извештаја о грешци"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Прикупљен је извештај о грешци"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додај аудио"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додај аудио и отпреми"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Отпреми"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Отпреми у GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозволе"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Извештај о грешци се већ прикупља"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Покренут је извештај о грешци"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"У току је прављење извештаја о грешци"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Извештај о грешци је покренут"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Прављење извештаја о грешци није успело"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимање екрана није успело"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Снимање стања није успело"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Снимање стања није успело"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"У току је прављење извештаја о грешци"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештај о грешци је прикупљен"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Извештај о грешци је прикупљен"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса извештаја о грешци"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sv/strings.xml b/tests/BugReportApp/res/values-sv/strings.xml
index a5b3fda..9d1914d 100644
--- a/tests/BugReportApp/res/values-sv/strings.xml
+++ b/tests/BugReportApp/res/values-sv/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beskriv problemet genom att prata"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ljudmeddelande till felrapporten klockan %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Inspelningen är slutförd"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En felrapport samlas redan in"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Felrapportering pågår"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En felrapport har samlats in"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lägg till ljud"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lägg till ljud och ladda upp"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Ladda upp"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Ladda upp till GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Bevilja behörigheter"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Felrapporten samlas redan in"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Felrapportering startas"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Felrapportering pågår"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Felrapporten har påbörjats"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Felrapporten misslyckades"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skärmbilden misslyckades"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Statusdumpen misslyckades"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Statusdumpen misslyckades"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Felrapporten har påbörjats"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Felrapporten samlas in"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Felrapporten har samlats in"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal för felrapportstatus"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-sw/strings.xml b/tests/BugReportApp/res/values-sw/strings.xml
index 881ca52..96cb870 100644
--- a/tests/BugReportApp/res/values-sw/strings.xml
+++ b/tests/BugReportApp/res/values-sw/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Zungumza na Ueleze Tatizo"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ujumbe wa sauti wa ripoti ya hitilafu wa %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Imemaliza kurekodi"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ripoti ya hitilafu tayari inakusanywa"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Inaendelea kuripoti hitilafu"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ripoti ya hitilafu imekusanywa"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Weka Ujumbe wa Sauti"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Weka Ujumbe wa Sauti na Upakie"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Pakia"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Pakia kwenye GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Tafadhali toa ruhusa"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ripoti ya hitilafu tayari inakusanywa"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Imeanza kuripoti hitilafu"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Inaendelea kuripoti hitilafu"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Imeanza kuripoti hitilafu"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Imeshindwa kuripoti hitilafu"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Imeshindwa kupiga picha ya skrini"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Imeshindwa kuhamishia data kwingine"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Huduma ya Dumpstate haikukamilika"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Inaendelea kuripoti hitilafu"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Ripoti ya hitilafu imekusanywa"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Imekusanya ripoti ya hitilafu"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kituo cha hali ya ripoti ya hitilafu"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ta/strings.xml b/tests/BugReportApp/res/values-ta/strings.xml
index bf0e227..c1da3e6 100644
--- a/tests/BugReportApp/res/values-ta/strings.xml
+++ b/tests/BugReportApp/res/values-ta/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"பேசுங்கள் &amp; சிக்கலை விளக்குங்கள்"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"பிழை அறிக்கைக்கான ஆடியோ மெசெஜ் %sக்கு"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ரெக்கார்டிங் முடிந்தது"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"பிழை அறிக்கை செயலிலுள்ளது"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ஆடியோவைச் சேர்"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ஆடியோவைச் சேர்த்து பதிவேற்றவும்"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"பதிவேற்று"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSஸுக்குப் பதிவேற்று"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"அனுமதிகளை வழங்குங்கள்"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"பிழை அறிக்கை தொடங்கப்பட்டது"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"பிழை அறிக்கை செயலிலுள்ளது"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"பிழை அறிக்கை தொடங்கப்பட்டது"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"பிழை அறிக்கை தோல்வி"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"திரையைப் படமெடுக்க முடியவில்லை"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"டம்ப் நிலை தோல்வி"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"டம்ப்ஸ்டேட் சேவை தோல்வியடைந்தது"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"பிழை அறிக்கை செயல்பாட்டிலுள்ளது"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"பிழை அறிக்கை நிலை தொடர்பான சேனல்"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-te/strings.xml b/tests/BugReportApp/res/values-te/strings.xml
index 1a8d6c5..f3710cd 100644
--- a/tests/BugReportApp/res/values-te/strings.xml
+++ b/tests/BugReportApp/res/values-te/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"మాట్లాడండి &amp; సమస్యను వివరించండి"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"బగ్ రిపోర్ట్‌ కోసం %s వద్ద ఆడియో మెసేజ్‌"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"రికార్డ్ చేయడం పూర్తయింది"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"బగ్ రిపోర్ట్‌ ఇప్పటికే సేకరించబడుతోంది"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"బగ్ రిపోర్ట్‌ ప్రోగ్రెస్‌లో ఉంది"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"బగ్ రిపోర్ట్‌ సేకరించబడింది"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ఆడియోను జోడించు"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ఆడియోను జోడించు &amp; అప్‌లోడ్ చేయి"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"అప్‌లోడ్ చేయండి"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSకు అప్‌లోడ్ చేయండి"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"దయచేసి అనుమతులను మంజూరు చేయండి"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"బగ్ రిపోర్ట్‌ ఇప్పటికే సేకరించబడుతోంది"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"బగ్‌ను నివేదించడం మొదలైంది"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"బగ్ రిపోర్ట్‌ ప్రోగ్రెస్‌లో ఉంది"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"బగ్ రిపోర్ట్ ప్రారంభించబడింది"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"బగ్ రిపోర్ట్‌ విఫలమైంది"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"స్క్రీన్ క్యాప్చర్ విఫలమైంది"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"డంప్ స్థితి విఫలమైంది"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"డంప్‌స్టేట్ విఫలమైంది"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"బగ్ రిపోర్ట్‌ ప్రోగ్రెస్‌లో ఉంది"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"బగ్ రిపోర్ట్‌ సేకరించబడింది"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"బగ్ రిపోర్ట్ సేకరించబడింది"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"బగ్ రిపోర్ట్‌ స్థితి ఛానెల్"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-th/strings.xml b/tests/BugReportApp/res/values-th/strings.xml
index 74a83aa..59d5499 100644
--- a/tests/BugReportApp/res/values-th/strings.xml
+++ b/tests/BugReportApp/res/values-th/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"พูดอธิบายปัญหา"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"ข้อความเสียงสำหรับรายงานข้อบกพร่องเมื่อ %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"บันทึกเสียงเสร็จแล้ว"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"อยู่ระหว่างรายงานข้อบกพร่อง"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"เพิ่มเสียง"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"เพิ่มเสียงและอัปโหลด"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"อัปโหลด"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"อัปโหลดไปยัง GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"โปรดให้สิทธิ์"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"เริ่มการรายงานข้อบกพร่องแล้ว"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"อยู่ระหว่างรายงานข้อบกพร่อง"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"เริ่มรายงานข้อบกพร่องแล้ว"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"รายงานข้อบกพร่องไม่สำเร็จ"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"จับภาพหน้าจอไม่สำเร็จ"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ดัมพ์สเตทไม่สำเร็จ"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ดัมพ์สเตทไม่สำเร็จ"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"อยู่ระหว่างรายงานข้อบกพร่อง"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ช่องทางของสถานะรายงานข้อบกพร่อง"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-tl/strings.xml b/tests/BugReportApp/res/values-tl/strings.xml
index f1f391e..c4fa6a7 100644
--- a/tests/BugReportApp/res/values-tl/strings.xml
+++ b/tests/BugReportApp/res/values-tl/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Magsalita at Ilarawan Ang Isyu"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message para sa ulat ng bug noong %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tapos na ang pag-record"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"May kinukuha nang ulat ng bug"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Isinasagawa ang ulat ng bug"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"May nakuhang ulat ng bug"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Magdagdag ng Audio"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Magdagdag ng Audio at I-upload"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"I-upload"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"I-upload sa GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Pakibigay ang mga pahintulot"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kinukuha na ang ulat ng bug"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Sinimulan ang pag-uulat ng bug"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Isinasagawa ang ulat ng bug"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Sinimulan ang ulat ng bug"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Hindi naisagawa ang ulat ng bug"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Hindi na-capture ang screen"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Hindi naisagawa ang dump state"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Hindi naisagawa ang dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Isinasagawa ang ulat ng bug"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Nakuha ang ulat ng bug"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Nakolekta na ang ulat ng bug"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Channel ng status ng ulat ng bug"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-tr/strings.xml b/tests/BugReportApp/res/values-tr/strings.xml
index d0f5e35..2770b53 100644
--- a/tests/BugReportApp/res/values-tr/strings.xml
+++ b/tests/BugReportApp/res/values-tr/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Konuşun ve Sorunu Açıklayın"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s hata raporu için sesli mesaj"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Kayıt tamamlandı"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Şu anda zaten bir hata raporu alınıyor"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Hata raporu devam ediyor"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Hata raporu alındı"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ses Ekle"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ses Ekle ve Yükle"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yükle"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'ye yükle"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Lütfen izinleri verin"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hata raporu zaten alınmış"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hata raporlama işlemi başladı"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Hata raporu devam ediyor"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Hata raporu başlatıldı"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Hata raporu başarısız"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran görüntüsü alınamadı"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Döküm durumu başarısız"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Döküm durumu başarısız"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Hata raporu devam ediyor"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hata raporu alındı"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Hata raporu toplandı"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hata raporu durum kanalı"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-uk/strings.xml b/tests/BugReportApp/res/values-uk/strings.xml
index 9a350e0..d0e20d5 100644
--- a/tests/BugReportApp/res/values-uk/strings.xml
+++ b/tests/BugReportApp/res/values-uk/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Говоріть і опишіть проблему"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудіо для звіту про помилку о %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запис завершено"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Звіт про помилку вже завантажується"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Звіт про помилку формується"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Звіт про помилку отримано"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додати аудіоповідомлення"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додати аудіоповідомлення й завантажити"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Завантажити"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Завантажити в GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Надайте дозволи"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Звіт про помилку вже завантажується"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Повідомлення про помилку розпочато"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Звіт про помилку формується"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Розпочато формування звіту про помилку"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Не вдалося надіслати звіт про помилку"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не вдалося зробити знімок екрана"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Помилка запису стану"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Помилка Dumpstate"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Звіт про помилку створюється"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Звіт про помилку отримано"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Звіт про помилку отримано"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану звіту про помилку"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ur/strings.xml b/tests/BugReportApp/res/values-ur/strings.xml
index a70586a..890f677 100644
--- a/tests/BugReportApp/res/values-ur/strings.xml
+++ b/tests/BugReportApp/res/values-ur/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"بولیں اور مسئلہ بیان کریں"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"‎%s پر بگ رپورٹ کے لیے آڈیو پیغام"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"رکارڈنگ مکمل ہو گئی"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"بگ رپورٹ پہلے سے ہی جمع کی جارہی ہے"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"بگ رپورٹ پیشرفت میں ہے"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"بگ رپورٹ جمع کر لی گئی ہے"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"آڈیو شامل کریں"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"آڈیو شامل اور اپ لوڈ کریں"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"اپ لوڈ کریں"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS پر اپ لوڈ کریں"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"براہ کرم اجازتوں کی منظوری دیں"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"بگ رپورٹ پہلے سے ہی جمع کی جا رہی ہے"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"بگ رپورٹنگ شروع کر دی گئی ہے"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"بگ رپورٹ پیشرفت میں ہے"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"بگ رپورٹ شروع ہو گئی ہے"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"بگ رپورٹ ناکام ہو گئی"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"اسکرین کیپچر ناکام ہو گیا"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ڈمپ اسٹیٹ ناکام ہو گیا"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"ڈمپ اسٹیٹ ناکام ہو گیا"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"بگ رپورٹ پیشرفت میں ہے"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"بگ رپورٹ جمع کی گئی ہے"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"بگ رپورٹ جمع کر لی گئی ہے"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"بگ رپورٹ کی صورتحال کا چینل"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-uz/strings.xml b/tests/BugReportApp/res/values-uz/strings.xml
index 7ae806b..4ff4d43 100644
--- a/tests/BugReportApp/res/values-uz/strings.xml
+++ b/tests/BugReportApp/res/values-uz/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Muammoni ovoz yordamida tasvirlang"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Xatolik hisoboti uchun audio xabar (%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yozib olish tugadi"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"Xatoliklar hisoboti yuklanmoqda"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Xatoliklar hisoboti jamlangan"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio kiritish"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio kiritish va yuklash"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yuklash"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS serverlariga yuklash"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Ruxsat bering"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Xatoliklar hisoboti yuklanmoqda"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Xato haqida hisobot berish boshlandi"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"Xatoliklar hisoboti yaratilmoqda"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Xatoliklar hisoboti yuborilmadi"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skrinshot olinmadi"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Damp holatida xatolik"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate xizmatida xatolik"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Xatoliklar hisoboti yuklanmoqda"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Xatoliklar hisoboti yuklandi"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"Xatoliklar hisoboti jamlandi"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Xatoliklar hisoboti holati kanali"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-vi/strings.xml b/tests/BugReportApp/res/values-vi/strings.xml
index 7454927..006d7dd 100644
--- a/tests/BugReportApp/res/values-vi/strings.xml
+++ b/tests/BugReportApp/res/values-vi/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hãy nói để mô tả vấn đề"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Thông báo bằng âm thanh cho báo cáo lỗi lúc %s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Đã ghi xong"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Đang thu thập báo cáo lỗi"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Đã thu thập báo cáo lỗi"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Thêm âm thanh"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Thêm âm thanh và tải lên"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Tải lên"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Tải lên GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Vui lòng cấp quyền"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Đang thu thập báo cáo lỗi"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Đã bắt đầu báo cáo lỗi"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"Không báo cáo được lỗi"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Không chụp được màn hình"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Không thu thập được nhật ký hệ thống"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Đang báo cáo lỗi"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Đã thu thập báo cáo lỗi"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kênh trạng thái báo cáo lỗi"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-zh-rCN/strings.xml b/tests/BugReportApp/res/values-zh-rCN/strings.xml
index 4460403..3734ce8 100644
--- a/tests/BugReportApp/res/values-zh-rCN/strings.xml
+++ b/tests/BugReportApp/res/values-zh-rCN/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"读出并说明问题"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s的错误报告的语音消息"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"录制完成"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已在收集错误报告"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"正在收集错误报告"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集错误报告"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"添加语音消息"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"添加语音消息并上传"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上传"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上传到 GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"请授予权限"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已在收集错误报告"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"错误报告流程已启动"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"正在收集错误报告"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"已开始收集错误报告"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"无法收集错误报告"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"无法截取屏幕截图"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"无法转储状态"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"转储状态失败"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集错误报告"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集错误报告"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"已收集错误报告"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"错误报告状态渠道"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-zh-rHK/strings.xml b/tests/BugReportApp/res/values-zh-rHK/strings.xml
index dc0d168..e2d15b2 100644
--- a/tests/BugReportApp/res/values-zh-rHK/strings.xml
+++ b/tests/BugReportApp/res/values-zh-rHK/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀和說明問題"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"錯誤報告語音訊息時間為:%s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"已完成記錄"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"正在產生錯誤報告"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集到錯誤報告"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"新增語音訊息"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"新增語音訊息並上載"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上載"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上載至 GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已收集錯誤報告"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"已開始錯誤報告程序"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"正在產生錯誤報告"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"已開始錯誤報告程序"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"無法產生錯誤報告"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"無法傾印狀態"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"無法傾印狀態"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在產生錯誤報告"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集錯誤報告"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"已收集錯誤報告"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-zh-rTW/strings.xml b/tests/BugReportApp/res/values-zh-rTW/strings.xml
index 75fc620..e6adf18 100644
--- a/tests/BugReportApp/res/values-zh-rTW/strings.xml
+++ b/tests/BugReportApp/res/values-zh-rTW/strings.xml
@@ -31,7 +31,7 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀並說明問題"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"錯誤報告的語音訊息 (時間:%s)"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"錄製結束"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"正在收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="1663500052146177338">"正在處理錯誤報告"</string>
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"錯誤報告收集完畢"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"新增語音訊息"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"新增語音訊息並上傳"</string>
@@ -39,12 +39,12 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上傳"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上傳到 GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"正在收集錯誤報告"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"已啟動錯誤回報程序"</string>
+    <string name="toast_bug_report_in_progress" msgid="5218530088025955746">"正在處理錯誤報告"</string>
+    <string name="toast_bug_report_started" msgid="891404618481185195">"錯誤報告作業已啟動"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"錯誤報告發生問題"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕畫面"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"傾印狀態發生問題"</string>
+    <string name="toast_status_dump_state_failed" msgid="3496460783060512078">"Dumpstate 失敗"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集錯誤報告"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"錯誤報告收集完畢"</string>
+    <string name="notification_bugreport_finished_title" msgid="1188447311929693472">"錯誤報告收集完成"</string>
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-zu/strings.xml b/tests/BugReportApp/res/values-zu/strings.xml
index 061f105..daffef7 100644
--- a/tests/BugReportApp/res/values-zu/strings.xml
+++ b/tests/BugReportApp/res/values-zu/strings.xml
@@ -31,7 +31,8 @@
     <string name="bugreport_dialog_title" msgid="3315160684205929910">"Khuluma uphinde uchaze inkinga"</string>
     <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Umlayezo womsindo wokubika kwesiphazamiso ku-%s"</string>
     <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukurekhoda kuqediwe"</string>
-    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Umbiko wesiphazamisi usuvele ulandiwe"</string>
+    <!-- no translation found for bugreport_dialog_in_progress_title (1663500052146177338) -->
+    <skip />
     <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kuqoqwe umbiko wesiphazamisi"</string>
     <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Engeza umsindo"</string>
     <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Engeza umsindo nokulayisha"</string>
@@ -39,12 +40,16 @@
     <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Layisha"</string>
     <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Layisha ku-GCS"</string>
     <string name="toast_permissions_denied" msgid="7054832711916992770">"Sicela unikeze izimvume"</string>
-    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Umbiko wesiphazamisi usuvele uqoqiwe"</string>
-    <string name="toast_bug_report_started" msgid="7154589593986557754">"Ukubikwa kwesiphazamiso kuqalile"</string>
+    <!-- no translation found for toast_bug_report_in_progress (5218530088025955746) -->
+    <skip />
+    <!-- no translation found for toast_bug_report_started (891404618481185195) -->
+    <skip />
     <string name="toast_status_failed" msgid="6365384202315043395">"Umbiko wesiphazamisi uhlulekile"</string>
     <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ukuthathwa kwesikrini kuhlulekile"</string>
-    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Isimo sokulahla sihlulekile"</string>
+    <!-- no translation found for toast_status_dump_state_failed (3496460783060512078) -->
+    <skip />
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Umbiko wesiphazamisi uyaqhubeka"</string>
-    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Umbiko wesiphazamisi uyaqoqwa"</string>
+    <!-- no translation found for notification_bugreport_finished_title (1188447311929693472) -->
+    <skip />
     <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Isiteshi sesimo sombiko wesiphazamisi"</string>
 </resources>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/car_telemetry_test.xml b/tests/EmbeddedKitchenSinkApp/res/layout/car_telemetry_test.xml
index 39c53fa..cfad246 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/car_telemetry_test.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/car_telemetry_test.xml
@@ -72,6 +72,56 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_start_memory_state_captured_config"/>
+        <Button
+            android:id="@+id/send_on_app_start_memory_state_captured_config"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/add_metrics_config"/>
+        <Button
+            android:id="@+id/remove_on_app_start_memory_state_captured_config"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/remove_metrics_config"/>
+        <Button
+            android:id="@+id/get_on_app_start_memory_state_captured_report"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_report"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/activity_foreground_state_changed_config"/>
+        <Button
+            android:id="@+id/send_on_activity_foreground_state_changed_config"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/add_metrics_config"/>
+        <Button
+            android:id="@+id/remove_on_activity_foreground_state_changed_config"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/remove_metrics_config"/>
+        <Button
+            android:id="@+id/get_on_activity_foreground_state_changed_report"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_report"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
         <Button
             android:id="@+id/show_mem_info_btn"
             android:layout_width="wrap_content"
diff --git a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
index 4fcb9f3..c4144e0 100644
--- a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
@@ -385,6 +385,8 @@
     <!-- CarTelemetryService Test -->
     <string name="gear_change_config" translate="false">on_gear_change:</string>
     <string name="process_memory_config" translate="false">process_memory:</string>
+    <string name="app_start_memory_state_captured_config" translate="false">app_start_memory_state_captured:</string>
+    <string name="activity_foreground_state_changed_config" translate="false">activity_foreground_state_changed:</string>
     <string name="add_metrics_config" translatable="false">Add MetricsConfig</string>
     <string name="remove_metrics_config" translatable="false">Remove MetricsConfig</string>
     <string name="get_report" translatable="false">Get Report</string>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/telemetry/CarTelemetryTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/telemetry/CarTelemetryTestFragment.java
index 5f548ed..64f7aa8 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/telemetry/CarTelemetryTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/telemetry/CarTelemetryTestFragment.java
@@ -16,6 +16,8 @@
 
 package com.google.android.car.kitchensink.telemetry;
 
+import static com.android.car.telemetry.TelemetryProto.StatsPublisher.SystemMetric.ACTIVITY_FOREGROUND_STATE_CHANGED;
+import static com.android.car.telemetry.TelemetryProto.StatsPublisher.SystemMetric.APP_START_MEMORY_STATE_CAPTURED;
 import static com.android.car.telemetry.TelemetryProto.StatsPublisher.SystemMetric.PROCESS_MEMORY_STATE;
 
 import android.annotation.NonNull;
@@ -95,7 +97,8 @@
                     + "published_data.page_major_fault)\n")
             .append("    result.oom_adj_score_avg = calculateAverage("
                     + "published_data.oom_adj_score)\n")
-            .append("    result.rss_in_bytes_avg = calculateAverage(published_data.rss_in_bytes)\n")
+            .append("    result.rss_in_bytes_avg = calculateAverage("
+                    + "published_data.rss_in_bytes)\n")
             .append("    result.swap_in_bytes_avg = calculateAverage("
                     + "published_data.swap_in_bytes)\n")
             .append("    result.cache_in_bytes_avg = calculateAverage("
@@ -125,6 +128,90 @@
             METRICS_CONFIG_PROCESS_MEMORY_V1.getName(),
             METRICS_CONFIG_PROCESS_MEMORY_V1.getVersion());
 
+    /** AppStartMemoryStateCaptured metric test. */
+    private static final String LUA_SCRIPT_ON_APP_START_MEMORY_STATE_CAPTURED = new StringBuilder()
+            .append("function calculateAverage(tbl)\n")
+            .append("    sum = 0\n")
+            .append("    size = 0\n")
+            .append("    for _, value in ipairs(tbl) do\n")
+            .append("        sum = sum + value\n")
+            .append("        size = size + 1\n")
+            .append("    end\n")
+            .append("    return sum/size\n")
+            .append("end\n")
+            .append("function onAppStartMemoryStateCaptured(published_data, state)\n")
+            .append("    result = {}\n")
+            .append("    result.uid = published_data.uid\n")
+            .append("    result.page_fault_avg = calculateAverage(published_data.page_fault)\n")
+            .append("    result.major_page_fault_avg = calculateAverage("
+                    + "published_data.page_major_fault)\n")
+            .append("    result.rss_in_bytes_avg = calculateAverage("
+                    + "published_data.rss_in_bytes)\n")
+            .append("    result.swap_in_bytes_avg = calculateAverage("
+                    + "published_data.swap_in_bytes)\n")
+            .append("    result.cache_in_bytes_avg = calculateAverage("
+                    + "published_data.cache_in_bytes)\n")
+            .append("    on_script_finished(result)\n")
+            .append("end\n")
+            .toString();
+
+    private static final TelemetryProto.Publisher APP_START_MEMORY_STATE_CAPTURED_PUBLISHER =
+            TelemetryProto.Publisher.newBuilder()
+                    .setStats(
+                            TelemetryProto.StatsPublisher.newBuilder()
+                                    .setSystemMetric(APP_START_MEMORY_STATE_CAPTURED)
+                    ).build();
+    private static final TelemetryProto.MetricsConfig METRICS_CONFIG_APP_START_MEMORY_V1 =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("app_start_memory_metrics_config")
+                    .setVersion(1)
+                    .setScript(LUA_SCRIPT_ON_APP_START_MEMORY_STATE_CAPTURED)
+                    .addSubscribers(
+                            TelemetryProto.Subscriber.newBuilder()
+                                    .setHandler("onAppStartMemoryStateCaptured")
+                                    .setPublisher(APP_START_MEMORY_STATE_CAPTURED_PUBLISHER)
+                                    .setPriority(0)) // high priority
+                    .build();
+    private static final MetricsConfigKey APP_START_MEMORY_STATE_CAPTURED_KEY_V1 =
+            new MetricsConfigKey(
+                    METRICS_CONFIG_APP_START_MEMORY_V1.getName(),
+                    METRICS_CONFIG_APP_START_MEMORY_V1.getVersion());
+
+    /** ActivityForegroundStateChanged metric test. */
+    private static final String LUA_SCRIPT_ON_ACTIVITY_FOREGROUND_STATE_CHANGED =
+            new StringBuilder()
+                .append("function onActivityForegroundStateChanged(published_data, state)\n")
+                .append("    result = {}\n")
+                .append("    result.uid = published_data.uid\n")
+                .append("    result.pkg_name = published_data.pkg_name\n")
+                .append("    result.class_name = published_data.class_name\n")
+                .append("    result.state = published_data.state\n")
+                .append("    on_script_finished(result)\n")
+                .append("end\n")
+                .toString();
+
+    private static final TelemetryProto.Publisher ACTIVITY_FOREGROUND_STATE_CHANGED_PUBLISHER =
+            TelemetryProto.Publisher.newBuilder()
+                    .setStats(
+                            TelemetryProto.StatsPublisher.newBuilder()
+                                    .setSystemMetric(ACTIVITY_FOREGROUND_STATE_CHANGED)
+                    ).build();
+    private static final TelemetryProto.MetricsConfig METRICS_CONFIG_ACTIVITY_FOREGROUND_STATE_V1 =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("activity_foreground_state_changed_config")
+                    .setVersion(1)
+                    .setScript(LUA_SCRIPT_ON_ACTIVITY_FOREGROUND_STATE_CHANGED)
+                    .addSubscribers(
+                            TelemetryProto.Subscriber.newBuilder()
+                                    .setHandler("onActivityForegroundStateChanged")
+                                    .setPublisher(ACTIVITY_FOREGROUND_STATE_CHANGED_PUBLISHER)
+                                    .setPriority(0)) // high priority
+                    .build();
+    private static final MetricsConfigKey ACTIVITY_FOREGROUND_STATE_CHANGED_KEY_V1 =
+            new MetricsConfigKey(
+                    METRICS_CONFIG_ACTIVITY_FOREGROUND_STATE_V1.getName(),
+                    METRICS_CONFIG_ACTIVITY_FOREGROUND_STATE_V1.getVersion());
+
     private final Executor mExecutor = Executors.newSingleThreadExecutor();
 
     private CarTelemetryManager mCarTelemetryManager;
@@ -161,6 +248,18 @@
                 .setOnClickListener(this::onRemoveProcessMemoryConfigBtnClick);
         view.findViewById(R.id.get_on_process_memory_report)
                 .setOnClickListener(this::onGetProcessMemoryReportBtnClick);
+        view.findViewById(R.id.send_on_app_start_memory_state_captured_config)
+                .setOnClickListener(this::onSendAppStartMemoryStateCapturedConfigBtnClick);
+        view.findViewById(R.id.remove_on_app_start_memory_state_captured_config)
+                .setOnClickListener(this::onRemoveAppStartMemoryStateCapturedConfigBtnClick);
+        view.findViewById(R.id.get_on_app_start_memory_state_captured_report)
+                .setOnClickListener(this::onGetAppStartMemoryStateCapturedReportBtnClick);
+        view.findViewById(R.id.send_on_activity_foreground_state_changed_config)
+                .setOnClickListener(this::onSendActivityForegroundStateChangedConfigBtnClick);
+        view.findViewById(R.id.remove_on_activity_foreground_state_changed_config)
+                .setOnClickListener(this::onRemoveActivityForegroundStateChangedConfigBtnClick);
+        view.findViewById(R.id.get_on_activity_foreground_state_changed_report)
+                .setOnClickListener(this::onGetActivityForegroundStateChangedReportBtnClick);
         view.findViewById(R.id.show_mem_info_btn).setOnClickListener(this::onShowMemInfoBtnClick);
         return view;
     }
@@ -192,22 +291,56 @@
     }
 
     private void onSendProcessMemoryConfigBtnClick(View view) {
-        showOutput("Sending MetricsConfig that listens for process memory state...");
+        showOutput("Sending MetricsConfig that listens for PROCESS_MEMORY_STATE...");
         mCarTelemetryManager.addMetricsConfig(PROCESS_MEMORY_KEY_V1,
                 METRICS_CONFIG_PROCESS_MEMORY_V1.toByteArray());
     }
 
     private void onRemoveProcessMemoryConfigBtnClick(View view) {
-        showOutput("Removing MetricsConfig that listens for process memory state...");
+        showOutput("Removing MetricsConfig that listens for PROCESS_MEMORY_STATE...");
         mCarTelemetryManager.removeMetricsConfig(PROCESS_MEMORY_KEY_V1);
     }
 
     private void onGetProcessMemoryReportBtnClick(View view) {
-        showOutput("Fetching report for process memory state... If nothing shows up within 5 "
+        showOutput("Fetching report for PROCESS_MEMORY_STATE... If nothing shows up within 5 "
                 + "seconds, there is no result yet");
         mCarTelemetryManager.sendFinishedReports(PROCESS_MEMORY_KEY_V1);
     }
 
+    private void onSendAppStartMemoryStateCapturedConfigBtnClick(View view) {
+        showOutput("Sending MetricsConfig that listens for APP_START_MEMORY_STATE_CAPTURED...");
+        mCarTelemetryManager.addMetricsConfig(APP_START_MEMORY_STATE_CAPTURED_KEY_V1,
+                METRICS_CONFIG_APP_START_MEMORY_V1.toByteArray());
+    }
+
+    private void onRemoveAppStartMemoryStateCapturedConfigBtnClick(View view) {
+        showOutput("Removing MetricsConfig that listens for APP_START_MEMORY_STATE_CAPTURED...");
+        mCarTelemetryManager.removeMetricsConfig(APP_START_MEMORY_STATE_CAPTURED_KEY_V1);
+    }
+
+    private void onGetAppStartMemoryStateCapturedReportBtnClick(View view) {
+        showOutput("Fetching report for APP_START_MEMORY_STATE_CAPTURED... "
+                + "If nothing shows up within 5 seconds, there is no result yet");
+        mCarTelemetryManager.sendFinishedReports(APP_START_MEMORY_STATE_CAPTURED_KEY_V1);
+    }
+
+    private void onSendActivityForegroundStateChangedConfigBtnClick(View view) {
+        showOutput("Sending MetricsConfig that listens for ACTIVITY_FOREGROUND_STATE_CHANGED...");
+        mCarTelemetryManager.addMetricsConfig(ACTIVITY_FOREGROUND_STATE_CHANGED_KEY_V1,
+                METRICS_CONFIG_ACTIVITY_FOREGROUND_STATE_V1.toByteArray());
+    }
+
+    private void onRemoveActivityForegroundStateChangedConfigBtnClick(View view) {
+        showOutput("Removing MetricsConfig that listens for ACTIVITY_FOREGROUND_STATE_CHANGED...");
+        mCarTelemetryManager.removeMetricsConfig(ACTIVITY_FOREGROUND_STATE_CHANGED_KEY_V1);
+    }
+
+    private void onGetActivityForegroundStateChangedReportBtnClick(View view) {
+        showOutput("Fetching report for ACTIVITY_FOREGROUND_STATE_CHANGED... "
+                + "If nothing shows up within 5 seconds, there is no result yet");
+        mCarTelemetryManager.sendFinishedReports(ACTIVITY_FOREGROUND_STATE_CHANGED_KEY_V1);
+    }
+
     /** Gets a MemoryInfo object for the device's current memory status. */
     private ActivityManager.MemoryInfo getAvailableMemory() {
         ActivityManager activityManager = getActivity().getSystemService(ActivityManager.class);
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
index c97720f..c5f30c2 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.car.telemetry.databroker;
 
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
+
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
@@ -318,8 +320,13 @@
 
     @Test
     public void testScheduleNextTask_largeInput_shouldPipeData() throws Exception {
-        mData.putBooleanArray("1 MB Array", new boolean [1024 * 1024]);
-        mDataBroker.getTaskQueue().add(mHighPriorityTask);
+        PersistableBundle data = new PersistableBundle();
+        data.putBooleanArray("1 MB Array", new boolean [1024 * 1024]);
+        ScriptExecutionTask highPriorityTask = new ScriptExecutionTask(
+                new DataSubscriber(mDataBroker, METRICS_CONFIG_FOO, SUBSCRIBER_FOO),
+                data,
+                SystemClock.elapsedRealtime());
+        mDataBroker.getTaskQueue().add(highPriorityTask);
 
         mDataBroker.scheduleNextTask();
 
@@ -328,11 +335,48 @@
     }
 
     @Test
+    public void testScheduleNextTask_largeReportWithApproxSize_shouldPipeData() throws Exception {
+        PersistableBundle data = new PersistableBundle();
+        data.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, 21000);
+        ScriptExecutionTask highPriorityTask = new ScriptExecutionTask(
+                new DataSubscriber(mDataBroker, METRICS_CONFIG_FOO, SUBSCRIBER_FOO),
+                data,
+                SystemClock.elapsedRealtime());
+        mDataBroker.getTaskQueue().add(highPriorityTask);
+
+        mDataBroker.scheduleNextTask();
+
+        waitForTelemetryThreadToFinish();
+        assertThat(mFakeScriptExecutor.getInvokeScriptForLargeInputCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testScheduleNextTask_smallReportWithApproxSize_doesNotPipeData() throws Exception {
+        PersistableBundle data = new PersistableBundle();
+        data.putInt(APPROX_BUNDLE_SIZE_BYTES_KEY, 1000);
+        ScriptExecutionTask highPriorityTask = new ScriptExecutionTask(
+                new DataSubscriber(mDataBroker, METRICS_CONFIG_FOO, SUBSCRIBER_FOO),
+                data,
+                SystemClock.elapsedRealtime());
+        mDataBroker.getTaskQueue().add(highPriorityTask);
+
+        mDataBroker.scheduleNextTask();
+
+        waitForTelemetryThreadToFinish();
+        assertThat(mFakeScriptExecutor.getInvokeScriptCount()).isEqualTo(1);
+    }
+
+    @Test
     public void testScheduleNextTask_largeInputPipeIOException_shouldIgnoreCurrentTask()
             throws Exception {
-        mData.putBooleanArray("1 MB Array", new boolean [1024 * 1024]);
+        PersistableBundle data = new PersistableBundle();
+        data.putBooleanArray("1 MB Array", new boolean [1024 * 1024]);
         PriorityBlockingQueue<ScriptExecutionTask> taskQueue = mDataBroker.getTaskQueue();
-        taskQueue.add(mHighPriorityTask); // invokeScriptForLargeInput() path
+        ScriptExecutionTask highPriorityTask = new ScriptExecutionTask(
+                new DataSubscriber(mDataBroker, METRICS_CONFIG_FOO, SUBSCRIBER_FOO),
+                data,
+                SystemClock.elapsedRealtime());
+        taskQueue.add(highPriorityTask); // invokeScriptForLargeInput() path
         taskQueue.add(new ScriptExecutionTask(
                 new DataSubscriber(mDataBroker, METRICS_CONFIG_FOO, SUBSCRIBER_FOO),
                 new PersistableBundle(),
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ActivityForegroundStateChangedConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ActivityForegroundStateChangedConverterTest.java
index 98a0925..221c716 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ActivityForegroundStateChangedConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ActivityForegroundStateChangedConverterTest.java
@@ -20,6 +20,7 @@
 import static com.android.car.telemetry.AtomsProto.ActivityForegroundStateChanged.PKG_NAME_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ActivityForegroundStateChanged.STATE_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ActivityForegroundStateChanged.UID_FIELD_NUMBER;
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -104,7 +105,8 @@
         PersistableBundle bundle = mConverter.convert(atomsList, DIM_FIELDS_IDS,
                 dimensionsValuesList, HASH_STR_MAP);
 
-        assertThat(bundle.size()).isEqualTo(4);
+        assertThat(bundle.size()).isEqualTo(5);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(120);
         assertThat(bundle.getIntArray(accessorMap.get(UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(1000, 2000).inOrder();
         assertThat(Arrays.asList(
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AppStartMemoryStateCapturedConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AppStartMemoryStateCapturedConverterTest.java
index 1579e00..b309069 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AppStartMemoryStateCapturedConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AppStartMemoryStateCapturedConverterTest.java
@@ -24,6 +24,7 @@
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.RSS_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.SWAP_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.UID_FIELD_NUMBER;
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -118,7 +119,8 @@
         PersistableBundle bundle = mConverter.convert(atomsList, DIM_FIELDS_IDS,
                 dimensionsValuesList, HASH_STR_MAP);
 
-        assertThat(bundle.size()).isEqualTo(8);
+        assertThat(bundle.size()).isEqualTo(9);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(204);
         assertThat(bundle.getIntArray(accessorMap.get(UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(1000, 2000).inOrder();
         assertThat(Arrays.asList(
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AtomListConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AtomListConverterTest.java
index a8cc426..4704966 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AtomListConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/AtomListConverterTest.java
@@ -16,6 +16,8 @@
 
 package com.android.car.telemetry.publisher.statsconverters;
 
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.PersistableBundle;
@@ -58,7 +60,8 @@
 
         PersistableBundle bundle = AtomListConverter.convert(pushedAtomsList, null, null, null);
 
-        assertThat(bundle.size()).isEqualTo(3);
+        assertThat(bundle.size()).isEqualTo(4);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(80);
         assertThat(bundle.getIntArray(
                 accessorMap.get(AppStartMemoryStateCaptured.UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(1000, 1100).inOrder();
@@ -94,7 +97,8 @@
 
         PersistableBundle bundle = AtomListConverter.convert(pulledAtomsList, null, null, null);
 
-        assertThat(bundle.size()).isEqualTo(3);
+        assertThat(bundle.size()).isEqualTo(4);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(76);
         assertThat(bundle.getIntArray(
                 accessorMap.get(ProcessMemoryState.UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(1000, 1100).inOrder();
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ConfigMetricsReportListConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ConfigMetricsReportListConverterTest.java
index 8d71b63..63ee0b8 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ConfigMetricsReportListConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ConfigMetricsReportListConverterTest.java
@@ -99,9 +99,8 @@
 
         Map<Long, PersistableBundle> map = ConfigMetricsReportListConverter.convert(reportList);
 
-        PersistableBundle eventBundle = map.get(12345L);
-        PersistableBundle gaugeBundle = map.get(23456L);
         assertThat(new ArrayList<Long>(map.keySet())).containsExactly(12345L, 23456L);
+        PersistableBundle eventBundle = map.get(12345L);
         assertThat(eventBundle.getLongArray(EventMetricDataConverter.ELAPSED_TIME_NANOS))
             .asList().containsExactly(99999999L);
         assertThat(eventBundle.getIntArray(
@@ -116,6 +115,7 @@
                 appMemAccessorMap.get(AppStartMemoryStateCaptured.RSS_IN_BYTES_FIELD_NUMBER)
                 .getFieldName()))
             .asList().containsExactly(1234L);
+        PersistableBundle gaugeBundle = map.get(23456L);
         assertThat(gaugeBundle.getIntArray(
                 procMemAccessorMap.get(ProcessMemoryState.UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(234);
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverterTest.java
index dac3310..0bac4cd 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/EventMetricDataConverterTest.java
@@ -19,6 +19,7 @@
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.ACTIVITY_NAME_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.RSS_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.AppStartMemoryStateCaptured.UID_FIELD_NUMBER;
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -66,7 +67,8 @@
 
         PersistableBundle bundle = EventMetricDataConverter.convertEventDataList(eventDataList);
 
-        assertThat(bundle.size()).isEqualTo(4);
+        assertThat(bundle.size()).isEqualTo(5);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(96);
         assertThat(bundle.getLongArray(EventMetricDataConverter.ELAPSED_TIME_NANOS))
             .asList().containsExactly(12345678L, 23456789L).inOrder();
         assertThat(bundle.getIntArray(accessorMap.get(UID_FIELD_NUMBER).getFieldName()))
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverterTest.java
index 8e747ae..808a6a1 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/GaugeMetricDataConverterTest.java
@@ -21,6 +21,7 @@
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.RSS_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.SWAP_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.UID_FIELD_NUMBER;
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -103,7 +104,8 @@
 
         // For each atom 2 fields were set, additionally 3 fields were encoded in dimension values,
         // and 1 elapsed time array, so 6 arrays are expected in the bundle.
-        assertThat(bundle.size()).isEqualTo(6);
+        assertThat(bundle.size()).isEqualTo(7);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(264);
         assertThat(bundle.getIntArray(accessorMap.get(UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(123, 123, 123, 234).inOrder();
         assertThat(Arrays.asList(bundle.getStringArray(
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ProcessMemoryStateConverterTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ProcessMemoryStateConverterTest.java
index f922d17..050cb4c 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ProcessMemoryStateConverterTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/publisher/statsconverters/ProcessMemoryStateConverterTest.java
@@ -24,6 +24,7 @@
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.RSS_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.SWAP_IN_BYTES_FIELD_NUMBER;
 import static com.android.car.telemetry.AtomsProto.ProcessMemoryState.UID_FIELD_NUMBER;
+import static com.android.car.telemetry.databroker.ScriptExecutionTask.APPROX_BUNDLE_SIZE_BYTES_KEY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -116,7 +117,8 @@
         PersistableBundle bundle = mConverter.convert(atomsList, DIM_FIELDS_IDS,
                 dimensionsValuesList, HASH_STR_MAP);
 
-        assertThat(bundle.size()).isEqualTo(8);
+        assertThat(bundle.size()).isEqualTo(9);
+        assertThat(bundle.getInt(APPROX_BUNDLE_SIZE_BYTES_KEY)).isEqualTo(156);
         assertThat(bundle.getIntArray(accessorMap.get(UID_FIELD_NUMBER).getFieldName()))
             .asList().containsExactly(1000, 2000).inOrder();
         assertThat(Arrays.asList(
diff --git a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
index b048b19..c360db0 100644
--- a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
@@ -469,12 +469,14 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(5000, 6000, 9000),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(5000, 6000, 9000),
@@ -506,12 +508,14 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(5000, 6000, 9000),
@@ -580,18 +584,21 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(50, 100, 150),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201000,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(5000, 6000, 9000),
                                 /* totalOveruses= */ 0)),
                 constructPackageIoOveruseStats(1303456,
                         /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(80, 170, 260),
@@ -649,11 +656,13 @@
 
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(5_070_000, 4500, 7000),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(7_000_000, 6000, 9000),
@@ -684,12 +693,14 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(100_000, 6000, 9000),
@@ -740,12 +751,14 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(300, 400, 700),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(500, 600, 900),
@@ -774,12 +787,14 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 constructPackageIoOveruseStats(1103456,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1201278,
                         /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(300, 400, 700),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(450, 120, 340),
                                 /* writtenBytes= */ constructPerStateBytes(500, 600, 900),
@@ -1008,6 +1023,7 @@
 
         List<PackageIoOveruseStats> packageIoOveruseStats = Collections.singletonList(
                 constructPackageIoOveruseStats(callingUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(80, 170, 260),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
@@ -1769,24 +1785,28 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 /* Overuse occurred but cannot be killed/disabled. */
                 constructPackageIoOveruseStats(criticalSysPkgUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 /* No overuse occurred but should be notified. */
                 constructPackageIoOveruseStats(nonCriticalSysPkgUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(50, 100, 150),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(20, 30, 40),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 /* Neither overuse occurred nor be notified. */
                 constructPackageIoOveruseStats(nonCriticalVndrPkgUid, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(25, 50, 75),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(200, 300, 400),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 /* Overuse occurred and can be killed/disabled. */
                 constructPackageIoOveruseStats(thirdPartyPkgUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
@@ -1857,18 +1877,21 @@
         List<PackageIoOveruseStats> packageIoOveruseStats = Arrays.asList(
                 /* Overuse occurred but cannot be killed/disabled. */
                 constructPackageIoOveruseStats(criticalSysSharedUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ false,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 /* No overuse occurred but should be notified. */
                 constructPackageIoOveruseStats(nonCriticalVndrSharedUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(50, 100, 150),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(200, 300, 400),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
                                 /* totalOveruses= */ 3)),
                 /* Overuse occurred and can be killed/disabled. */
                 constructPackageIoOveruseStats(thirdPartySharedUid, /* shouldNotify= */ true,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(100, 200, 300),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
@@ -2015,11 +2038,13 @@
         setDate(1);
         List<PackageIoOveruseStats> prevDayStats = Arrays.asList(
                 constructPackageIoOveruseStats(1011200, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(600, 700, 800),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(0, 0, 0),
                                 /* writtenBytes= */ constructPerStateBytes(600, 700, 800),
                                 /* totalOveruses= */ 3)),
                 constructPackageIoOveruseStats(1001100, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(1050, 1100, 1200),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(50, 60, 70),
                                 /* writtenBytes= */ constructPerStateBytes(1100, 1200, 1300),
@@ -2033,18 +2058,20 @@
                         /* totalTimesKilled= */ 1)),
                 new WatchdogStorage.IoUsageStatsEntry(/* userId= */ 10, "third_party_package",
                         new WatchdogPerfHandler.PackageIoUsage(prevDayStats.get(1).ioOveruseStats,
-                                /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
+                                /* forgivenWriteBytes= */ constructPerStateBytes(1050, 1100, 1200),
                                 /* totalTimesKilled= */ 0)));
 
         setDisplayStateEnabled(true);
         setDate(0);
         List<PackageIoOveruseStats> currentDayStats = Arrays.asList(
                 constructPackageIoOveruseStats(1011200, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(500, 550, 600),
                                 /* writtenBytes= */ constructPerStateBytes(100, 150, 200),
                                 /* totalOveruses= */ 0)),
                 constructPackageIoOveruseStats(1001100, /* shouldNotify= */ false,
+                        /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                         constructInternalIoOveruseStats(/* killableOnOveruse= */ true,
                                 /* remainingWriteBytes= */ constructPerStateBytes(250, 360, 470),
                                 /* writtenBytes= */ constructPerStateBytes(900, 900, 900),
@@ -2465,37 +2492,6 @@
     }
 
     @Test
-    public void testSaveToStorageAfterResetResourceOveruseStats() throws Exception {
-        setDate(1);
-        mGenericPackageNameByUid.put(1011200, "system_package");
-        SparseArray<PackageIoOveruseStats> stats = injectIoOveruseStatsForPackages(
-                mGenericPackageNameByUid, /* killablePackages= */ new ArraySet<>(),
-                /* shouldNotifyPackages= */ new ArraySet<>());
-
-        mWatchdogServiceForSystemImpl.resetResourceOveruseStats(
-                Collections.singletonList("system_package"));
-
-        /* |resetResourceOveruseStats| sets the package's IoOveruseStats to null, packages with
-         * null I/O stats are not written to disk. Push new IoOveruseStats to the |system_package|
-         * so that the package can be written to the database when date changes.
-         */
-        pushLatestIoOveruseStatsAndWait(Collections.singletonList(stats.get(1011200)));
-
-        /* Force write to disk by changing the date and pushing new I/O overuse stats. */
-        setDate(0);
-        pushLatestIoOveruseStatsAndWait(Collections.singletonList(new PackageIoOveruseStats()));
-
-        WatchdogStorage.IoUsageStatsEntry expectedSavedEntries =
-                new WatchdogStorage.IoUsageStatsEntry(/* userId= */ 10, "system_package",
-                        new WatchdogPerfHandler.PackageIoUsage(stats.get(1011200).ioOveruseStats,
-                                /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
-                                /* totalTimesKilled= */ 0));
-
-        IoUsageStatsEntrySubject.assertThat(mIoUsageStatsEntries)
-                .containsExactlyElementsIn(Collections.singletonList(expectedSavedEntries));
-    }
-
-    @Test
     public void testGetPackageInfosForUids() throws Exception {
         injectPackageInfos(Arrays.asList(
                 constructPackageManagerPackageInfo(
@@ -2971,6 +2967,7 @@
             int uid = genericPackageNameByUid.keyAt(i);
             PackageIoOveruseStats stats = constructPackageIoOveruseStats(uid,
                     shouldNotifyPackages.contains(name),
+                    constructPerStateBytes(80, 147, 213),
                     constructInternalIoOveruseStats(killablePackages.contains(name),
                             /* remainingWriteBytes= */ constructPerStateBytes(20, 20, 20),
                             /* writtenBytes= */ constructPerStateBytes(100, 200, 300),
@@ -3079,30 +3076,35 @@
             // Overuse occurred but cannot be killed/disabled.
             packageIoOveruseStats.add(constructPackageIoOveruseStats(
                     UserHandle.getUid(users[i], 10001), /* shouldNotify= */ true,
+                    /* forgivenWriteBytes= */ writtenBytes,
                     constructInternalIoOveruseStats(
                             /* killableOnOveruse= */ false, zeroRemainingBytes, writtenBytes,
                             totalOveruses)));
             // No overuse occurred but the package should be notified.
             packageIoOveruseStats.add(constructPackageIoOveruseStats(
                     UserHandle.getUid(users[i], 10002), /* shouldNotify= */ true,
+                    /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                     constructInternalIoOveruseStats(
                             /* killableOnOveruse= */ true, nonZeroRemainingBytes, writtenBytes,
                             totalOveruses)));
             // Neither overuse occurred nor be notified.
             packageIoOveruseStats.add(constructPackageIoOveruseStats(
                     UserHandle.getUid(users[i], 10003), /* shouldNotify= */ false,
+                    /* forgivenWriteBytes= */ constructPerStateBytes(0, 0, 0),
                     constructInternalIoOveruseStats(
                             /* killableOnOveruse= */ false, nonZeroRemainingBytes, writtenBytes,
                             totalOveruses)));
             // Overuse occurred and can be killed/disabled.
             packageIoOveruseStats.add(constructPackageIoOveruseStats(
                     UserHandle.getUid(users[i], 10004), /* shouldNotify= */ false,
+                    /* forgivenWriteBytes= */ writtenBytes,
                     constructInternalIoOveruseStats(
                             /* killableOnOveruse= */ true, zeroRemainingBytes, writtenBytes,
                             totalOveruses)));
             // Overuse occurred and can be killed/disabled.
             packageIoOveruseStats.add(constructPackageIoOveruseStats(
                     UserHandle.getUid(users[i], 10005), /* shouldNotify= */ true,
+                    /* forgivenWriteBytes= */ writtenBytes,
                     constructInternalIoOveruseStats(
                             /* killableOnOveruse= */ true, zeroRemainingBytes, writtenBytes,
                             totalOveruses)));
@@ -3272,10 +3274,12 @@
     }
 
     private static PackageIoOveruseStats constructPackageIoOveruseStats(int uid,
-            boolean shouldNotify, android.automotive.watchdog.IoOveruseStats ioOveruseStats) {
+            boolean shouldNotify, android.automotive.watchdog.PerStateBytes forgivenWriteBytes,
+            android.automotive.watchdog.IoOveruseStats ioOveruseStats) {
         PackageIoOveruseStats stats = new PackageIoOveruseStats();
         stats.uid = uid;
         stats.shouldNotify = shouldNotify;
+        stats.forgivenWriteBytes = forgivenWriteBytes;
         stats.ioOveruseStats = ioOveruseStats;
         return stats;
     }