diff --git a/services/Android.bp b/services/Android.bp
index 8947393849c17b8b2e728320126bb82d13ae3ead..536dc5d8ccd6e017353475b413d8770838b946a1 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -42,7 +42,9 @@ system_optimized_java_defaults {
         SYSTEM_OPTIMIZE_JAVA: {
             optimize: {
                 enabled: true,
-                optimize: true,
+                // TODO(b/210510433): Enable optimizations after improving
+                // retracing infra.
+                optimize: false,
                 shrink: true,
                 proguard_flags_files: ["proguard.flags"],
             },