diff --git a/libwvdrmengine/src_hidl/WVDrmFactory.cpp b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
index be688053..533e0d90 100644
--- a/libwvdrmengine/src_hidl/WVDrmFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
@@ -63,7 +63,6 @@ bool WVDrmFactory::areSpoidsEnabled() {
     // version is the first if it's a factory ROM.
     firstApiLevel = property_get_int32("ro.build.version.sdk", 0);
   }
-  // TODO(juce): b/34548395 Make sure this API version is correct.
   return firstApiLevel >= 26;  // Android O
 }
 
diff --git a/libwvdrmengine/test/unit/WVDrmFactory_test.cpp b/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
index 4336d979..52fa2bad 100644
--- a/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
+++ b/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
@@ -104,7 +104,6 @@ TEST(WVDrmFactoryTest, CalculatesSpoidUseCorrectly) {
     // version is the first if it's a factory ROM.
     firstApiLevel = property_get_int32("ro.build.version.sdk", 0);
   }
-  // TODO(juce): b/34548395 Make sure this API version is correct.
   bool shouldUseSpoids = (firstApiLevel >= 26);  // Android O
 
   EXPECT_EQ(shouldUseSpoids, factory.areSpoidsEnabled()) <<