diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
index 485fc36c46b..072180db945 100644
--- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
@@ -443,6 +443,8 @@ public void configure(String mimeType, int channelCount, int sampleRate,
       default:
         throw new IllegalArgumentException("Unsupported channel count: " + channelCount);
     }
+
+    // Workaround for overly strict channel configuration checks on nVidia Shield.
     if (Util.SDK_INT <= 23 && "foster".equals(Util.DEVICE) && "NVIDIA".equals(Util.MANUFACTURER)) {
       switch(channelCount) {
         case 7: