diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index 503606ae..04de41d7 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -626,7 +626,9 @@ void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
     addPixelStateResidencyDataProvider(p);
-    addAoC(p);
+    // TODO(b/220032540): Re-enable AoC reporting when AoC long latency issue is fixed or
+    // the timeout mechanism is merged.
+    //addAoC(p);
     addDvfsStats(p);
     addSoC(p);
     addCPUclusters(p);