diff --git a/library/src/main/java/com/google/android/exoplayer/C.java b/library/src/main/java/com/google/android/exoplayer/C.java
index c4e7b67b00..10db51d884 100644
--- a/library/src/main/java/com/google/android/exoplayer/C.java
+++ b/library/src/main/java/com/google/android/exoplayer/C.java
@@ -46,7 +46,7 @@ public interface C {
   /**
    * The number of nanoseconds in one second.
    */
-  public static final long NANOS_PER_SECOND = 1000000000L;
+  long NANOS_PER_SECOND = 1000000000L;
 
   /**
    * Represents an unbounded length of data.
@@ -202,6 +202,11 @@ public interface C {
    */
   int DEFAULT_TEXT_BUFFER_SIZE = 2 * DEFAULT_BUFFER_SEGMENT_SIZE;
 
+  /**
+   * A default size in bytes for a metadata buffer.
+   */
+  int DEFAULT_METADATA_BUFFER_SIZE = 2 * DEFAULT_BUFFER_SEGMENT_SIZE;
+
   /**
    * A default size in bytes for a muxed buffer (e.g. containing video, audio and text).
    */
diff --git a/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java b/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java
index a24a21d212..c1815b20de 100644
--- a/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java
+++ b/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java
@@ -33,8 +33,7 @@ public final class TrackSelectionArray {
   private int hashCode;
 
   /**
-   * @param trackSelections The selections. Must not be null or contain null elements, but may be
-   *     empty.
+   * @param trackSelections The selections. Must not be null, but may contain null elements.
    */
   public TrackSelectionArray(TrackSelection... trackSelections) {
     this.trackSelections = trackSelections;
diff --git a/library/src/main/java/com/google/android/exoplayer/util/Util.java b/library/src/main/java/com/google/android/exoplayer/util/Util.java
index cbcb9f6714..b78b21409c 100644
--- a/library/src/main/java/com/google/android/exoplayer/util/Util.java
+++ b/library/src/main/java/com/google/android/exoplayer/util/Util.java
@@ -789,6 +789,8 @@ public final class Util {
         return C.DEFAULT_VIDEO_BUFFER_SIZE;
       case C.TRACK_TYPE_TEXT:
         return C.DEFAULT_TEXT_BUFFER_SIZE;
+      case C.TRACK_TYPE_METADATA:
+        return C.DEFAULT_METADATA_BUFFER_SIZE;
       default:
         throw new IllegalStateException();
     }