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 f3c5a11e89..c8fd3abdcd 100644
--- a/library/src/main/java/com/google/android/exoplayer/C.java
+++ b/library/src/main/java/com/google/android/exoplayer/C.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer;
 
+import com.google.android.exoplayer.util.Util;
+
 import android.media.AudioFormat;
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
@@ -73,6 +75,15 @@ public final class C {
   public static final int ENCODING_DTS = 7;
   public static final int ENCODING_DTS_HD = 8;
 
+  // TODO: Change 6396 to AudioFormat.CHANNEL_OUT_7POINT1_SURROUND when the target API version is
+  // >= 23.
+  /**
+   * @see AudioFormat#CHANNEL_OUT_7POINT1_SURROUND
+   */
+  @SuppressWarnings({"InlinedApi", "deprecation"})
+  public static final int CHANNEL_OUT_7POINT1_SURROUND = Util.SDK_INT < 23
+      ? AudioFormat.CHANNEL_OUT_7POINT1 : 6396;
+
   /**
    * @see MediaExtractor#SAMPLE_FLAG_SYNC
    */
diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
index 73a6f9a61b..74c12cb17c 100644
--- a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
+++ b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
@@ -398,7 +398,7 @@ public final class AudioTrack {
         channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
         break;
       case 8:
-        channelConfig = AudioFormat.CHANNEL_OUT_7POINT1;
+        channelConfig = C.CHANNEL_OUT_7POINT1_SURROUND;
         break;
       default:
         throw new IllegalArgumentException("Unsupported channel count: " + channelCount);
diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
index 6e42cea28d..a0a3ab0710 100644
--- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
@@ -434,6 +434,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
       super(looper);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void handleMessage(Message msg) {
       if (openCount == 0 || (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS)) {