diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
index 16e00be16b4..d37b88a8e88 100644
--- a/firebase-common/firebase-common.gradle
+++ b/firebase-common/firebase-common.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
     implementation "com.google.android.gms:play-services-tasks:17.0.0"
 
-    api 'com.google.auto.value:auto-value-annotations:1.6.5'
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
     // needed for Kotlin detection to compile, but not necessarily present at runtime.
@@ -79,7 +79,7 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:2.25.0'
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
+    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/firebase-common/proguard.txt b/firebase-common/proguard.txt
index ac9942caa36..5cfe35313b5 100644
--- a/firebase-common/proguard.txt
+++ b/firebase-common/proguard.txt
@@ -1 +1,3 @@
 -dontwarn com.google.firebase.platforminfo.KotlinDetector
+-dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.AutoValue$Builder
diff --git a/transport/transport-api/proguard.txt b/transport/transport-api/proguard.txt
new file mode 100644
index 00000000000..1164bd82278
--- /dev/null
+++ b/transport/transport-api/proguard.txt
@@ -0,0 +1,2 @@
+-dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.AutoValue$Builder
diff --git a/transport/transport-api/transport-api.gradle b/transport/transport-api/transport-api.gradle
index d4bb3a1af10..4d08b6a6459 100644
--- a/transport/transport-api/transport-api.gradle
+++ b/transport/transport-api/transport-api.gradle
@@ -35,9 +35,9 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
-    compileOnly 'androidx.annotation:annotation:1.1.0'
-    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     testImplementation 'junit:junit:4.13-beta-3'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
 }
diff --git a/transport/transport-backend-cct/proguard.txt b/transport/transport-backend-cct/proguard.txt
new file mode 100644
index 00000000000..1164bd82278
--- /dev/null
+++ b/transport/transport-backend-cct/proguard.txt
@@ -0,0 +1,2 @@
+-dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.AutoValue$Builder
diff --git a/transport/transport-backend-cct/transport-backend-cct.gradle b/transport/transport-backend-cct/transport-backend-cct.gradle
index cbe0fc5bf5f..d58ab9f30c2 100644
--- a/transport/transport-backend-cct/transport-backend-cct.gradle
+++ b/transport/transport-backend-cct/transport-backend-cct.gradle
@@ -56,9 +56,9 @@ dependencies {
     implementation project(':encoders:firebase-encoders-json')
     implementation 'androidx.annotation:annotation:1.1.0'
 
-    compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+    compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
 
-    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
+    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     annotationProcessor project(':encoders:firebase-encoders-processor')
 
     testImplementation 'com.google.protobuf:protobuf-java:3.10.0'
diff --git a/transport/transport-runtime/proguard.txt b/transport/transport-runtime/proguard.txt
new file mode 100644
index 00000000000..1164bd82278
--- /dev/null
+++ b/transport/transport-runtime/proguard.txt
@@ -0,0 +1,2 @@
+-dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.AutoValue$Builder
diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle
index a7b8d3fcbf0..72772aef740 100644
--- a/transport/transport-runtime/transport-runtime.gradle
+++ b/transport/transport-runtime/transport-runtime.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation 'com.google.dagger:dagger:2.27'
     implementation 'androidx.annotation:annotation:1.1.0'
 
-    compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+    compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
 
     annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     annotationProcessor 'com.google.dagger:dagger-compiler:2.24'