diff --git a/.librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml b/.librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml
new file mode 100644
index 000000000000..0ed1bab55e2d
--- /dev/null
+++ b/.librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml
@@ -0,0 +1,22 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+description: Allow documentation warnings for google-shopping-merchant-accounts due to formatting issue in google/protobuf/empty.proto
+url: https://github.com/googleapis/gapic-generator-python/issues/2490
+replacements:
+  - paths: [
+      packages/google-shopping-merchant-accounts/noxfile.py,
+    ]
+    before: '        "-W",  # warnings as errors\n'
+    after: ''
+    count: 1
diff --git a/.librarian/state.yaml b/.librarian/state.yaml
index a074a5a7bf00..d5baac53d154 100644
--- a/.librarian/state.yaml
+++ b/.librarian/state.yaml
@@ -3980,7 +3980,7 @@ libraries:
     tag_format: '{id}-v{version}'
   - id: google-shopping-merchant-accounts
     version: 1.2.0
-    last_generated_commit: 535d161c24965e9ed1a0b27032cc1c8b4beab818
+    last_generated_commit: 55ab9c6263bafb0ef1aa2d8722d190c1697bcbcb
     apis:
       - path: google/shopping/merchant/accounts/v1
         service_config: merchantapi_v1.yaml
diff --git a/packages/google-shopping-merchant-accounts/noxfile.py b/packages/google-shopping-merchant-accounts/noxfile.py
index e7e210181a5f..830abad3da56 100644
--- a/packages/google-shopping-merchant-accounts/noxfile.py
+++ b/packages/google-shopping-merchant-accounts/noxfile.py
@@ -378,7 +378,6 @@ def docs(session):
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(
         "sphinx-build",
-        "-W",  # warnings as errors
         "-T",  # show full traceback on exception
         "-N",  # no colors
         "-b",