diff --git a/libwvdrmengine/cdm/metrics/include/metrics_front_end.h b/libwvdrmengine/cdm/metrics/include/metrics_front_end.h
index 12838a82..79b97deb 100644
--- a/libwvdrmengine/cdm/metrics/include/metrics_front_end.h
+++ b/libwvdrmengine/cdm/metrics/include/metrics_front_end.h
@@ -40,7 +40,14 @@ class MetricsFrontEnd {
 
 #define NO_TIME 0
 
-#define M_RECORD(GROUP, METRIC, TIME, ...) \
+#if 0 // Disable metrics for now to work around P0:b/35093325
+
+#define M_RECORD(GROUP, METRIC, TIME, ...)
+#define M_TIME(CALL, GROUP, METRIC, ...)
+
+#else // Re-enable when we have time to debug
+
+#define M_RECORD(GROUP, METRIC, TIME, ...)      \
   if ( GROUP ) { \
     ( GROUP ) -> METRIC . Record( TIME, ##__VA_ARGS__ ); \
   }
@@ -54,5 +61,6 @@ class MetricsFrontEnd {
   } else { \
     CALL; \
   }
+#endif // Disable
 
 #endif
diff --git a/libwvdrmengine/cdm/metrics/src/metrics_group.cpp b/libwvdrmengine/cdm/metrics/src/metrics_group.cpp
index b1a3fd4a..06a69177 100644
--- a/libwvdrmengine/cdm/metrics/src/metrics_group.cpp
+++ b/libwvdrmengine/cdm/metrics/src/metrics_group.cpp
@@ -393,11 +393,13 @@ MetricsGroup::MetricsGroup() :
         "min_version") { }
 
 MetricsGroup::~MetricsGroup() {
+#if 0 // Disable metrics for now to work around P0:b/35093325
   MetricNotification* subscriber = MFE.CreateSubscriber();
   if (subscriber) {
     Publish(subscriber);
   }
   delete subscriber;
+#endif
 }
 
 void MetricsGroup::Publish(MetricNotification* subscriber) {