diff --git a/.github/workflows/changes-in-high-risk-code.yml b/.github/workflows/changes-in-high-risk-code.yml
index 64decbe48f..3c1c75ff96 100644
--- a/.github/workflows/changes-in-high-risk-code.yml
+++ b/.github/workflows/changes-in-high-risk-code.yml
@@ -41,9 +41,25 @@ jobs:
           script: |
             const highRiskFiles = process.env.high_risk_code;
             const fileList = highRiskFiles.split(',').map(file => `- [ ] ${file}`).join('\n');
-            github.rest.issues.createComment({
+            
+            // Get existing comments
+            const comments = await github.rest.issues.listComments({
               issue_number: context.issue.number,
               owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `### 🚨 Detected changes in high risk code 🚨 \n High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:\n ${fileList}`
-            })
+              repo: context.repo.repo
+            });
+            
+            // Check if we already have a high risk code comment
+            const hasExistingComment = comments.data.some(comment => 
+              comment.body.includes('🚨 Detected changes in high risk code 🚨')
+            );
+            
+            // Only create comment if we don't already have one
+            if (!hasExistingComment) {
+              await github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: `### 🚨 Detected changes in high risk code 🚨 \n High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:\n ${fileList}`
+              });
+            }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2257e68df9..912671522b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,12 @@
     - No user context exists
     - User context exists but IP address is null
 
+### Dependencies
+
+- Bump Android SDK from v7.16.0 to v7.17.0 ([#2408](https://github.com/getsentry/sentry-dart/pull/2408))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7170)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.16.0...7.17.0)
+
 ## 8.10.1
 
 ### Fixes
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
index 406ce7c7bf..6c405032ea 100644
--- a/flutter/android/build.gradle
+++ b/flutter/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:7.16.0'
+    api 'io.sentry:sentry-android:7.17.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework