diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
index ca41495820..4acf3e50f1 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
@@ -63,13 +63,16 @@ public class SampleChooserActivity extends Activity {
     sampleAdapter.addAll((Object[]) Samples.WIDEVINE_GTS);
     sampleAdapter.add(new Header("Widevine DASH"));
     sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_MP4);
-    // try {
-    //   if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, true) != null) {
-    //     sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_WEBM);
-    //   }
-    // } catch (DecoderQueryException e) {
-    //   Log.e(TAG, "Failed to query vp9 decoder", e);
-    // }
+    try {
+      if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false) != null) {
+        sampleAdapter.addAll((Object[]) Samples.WIDEVINE_VP9_WEBM_CLEAR);
+      }
+      if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, true) != null) {
+        sampleAdapter.addAll((Object[]) Samples.WIDEVINE_VP9_WEBM_SECURE);
+      }
+    } catch (DecoderQueryException e) {
+      Log.e(TAG, "Failed to query vp9 decoder", e);
+    }
     sampleAdapter.add(new Header("SmoothStreaming"));
     sampleAdapter.addAll((Object[]) Samples.SMOOTHSTREAMING);
     sampleAdapter.add(new Header("HLS"));
diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
index f82b0649ed..badf140191 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
@@ -105,7 +105,13 @@ import java.util.Locale;
         PlayerActivity.TYPE_DASH),
   };
 
-  public static final Sample[] WIDEVINE_DASH_WEBM = new Sample[] {
+  public static final Sample[] WIDEVINE_VP9_WEBM_CLEAR = new Sample[] {
+    new Sample("WV: Clear (WebM,VP9)",
+        "https://storage.googleapis.com/wvmedia/clear/vp9/sintel-multicodec-4k/sintel-vp9.mpd",
+        PlayerActivity.TYPE_DASH),
+  };
+
+  public static final Sample[] WIDEVINE_VP9_WEBM_SECURE = new Sample[] {
     new Sample("WV: Secure (WebM,VP9)", "01234567", "widevine_test",
         "https://storage.googleapis.com/wvmedia/cenc/vp9/sintel-multicodec-4k/sintel-vp9.mpd",
         PlayerActivity.TYPE_DASH),