diff --git a/demo/src/main/assets/sample_media.exolist.json b/demo/src/main/assets/media.exolist.json
similarity index 99%
rename from demo/src/main/assets/sample_media.exolist.json
rename to demo/src/main/assets/media.exolist.json
index 3a608b18fb..b067098baa 100644
--- a/demo/src/main/assets/sample_media.exolist.json
+++ b/demo/src/main/assets/media.exolist.json
@@ -287,8 +287,7 @@
       {
         "name": "Super speed (PlayReady)",
         "uri": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism",
-        "drm_scheme": "playready",
-        "drm_license_url": "http://playready.directtaps.net/pr/svc/rightsmanager.asmx"
+        "drm_scheme": "playready"
       }
     ]
   },
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index 11ae06a527..ca4234d7b0 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -64,7 +64,7 @@ public class SampleChooserActivity extends Activity {
       uris = new String[] {dataUri};
     } else {
       uris = new String[] {
-          "asset:///sample_media.exolist.json",
+          "asset:///media.exolist.json",
       };
     }
     SampleListLoader loaderTask = new SampleListLoader();
@@ -136,7 +136,8 @@ public class SampleChooserActivity extends Activity {
 
       reader.beginObject();
       while (reader.hasNext()) {
-        switch (reader.nextName()) {
+        String name = reader.nextName();
+        switch (name) {
           case "name":
             groupName = reader.nextString();
             break;
@@ -147,6 +148,11 @@ public class SampleChooserActivity extends Activity {
             }
             reader.endArray();
             break;
+          case "_comment":
+            reader.nextString(); // Ignore.
+            break;
+          default:
+            throw new ParserException("Unsupported name: " + name);
         }
       }
       reader.endObject();