diff --git a/library/doc_src/images/exoplayer_diagrams.svg b/library/doc/images/exoplayer_diagrams.svg
similarity index 100%
rename from library/doc_src/images/exoplayer_diagrams.svg
rename to library/doc/images/exoplayer_diagrams.svg
diff --git a/library/doc_src/images/exoplayer_playbackstate.png b/library/doc/images/exoplayer_playbackstate.png
similarity index 100%
rename from library/doc_src/images/exoplayer_playbackstate.png
rename to library/doc/images/exoplayer_playbackstate.png
diff --git a/library/doc_src/images/exoplayer_state.png b/library/doc/images/exoplayer_state.png
similarity index 100%
rename from library/doc_src/images/exoplayer_state.png
rename to library/doc/images/exoplayer_state.png
diff --git a/library/doc_src/images/exoplayer_threading_model.png b/library/doc/images/exoplayer_threading_model.png
similarity index 100%
rename from library/doc_src/images/exoplayer_threading_model.png
rename to library/doc/images/exoplayer_threading_model.png
diff --git a/library/doc_src/images/trackrenderer_state.png b/library/doc/images/trackrenderer_state.png
similarity index 100%
rename from library/doc_src/images/trackrenderer_state.png
rename to library/doc/images/trackrenderer_state.png
diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
index 3aa729e053..5c8a0056d6 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
@@ -268,7 +268,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
   @Override
   protected void seekTo(long positionUs) throws ExoPlaybackException {
     super.seekTo(positionUs);
-    // TODO: Try and re-use the same AudioTrack instance once [redacted] is fixed.
+    // TODO: Try and re-use the same AudioTrack instance once [Internal: b/7941810] is fixed.
     audioTrack.reset();
     currentPositionUs = Long.MIN_VALUE;
   }
diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
index fdd4020769..feb9cf2996 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
@@ -467,7 +467,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
     waitingForFirstSyncFrame = true;
     decodeOnlyPresentationTimestamps.clear();
     // Workaround for framework bugs.
-    // See [redacted], [redacted], [redacted].
+    // See [Internal: b/8347958], [Internal: b/8578467], [Internal: b/8543366].
     if (Util.SDK_INT >= 18) {
       codec.flush();
     } else {
diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
index 858597e3ac..397f83cb88 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
@@ -103,7 +103,7 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
 
   }
 
-  // TODO: Use MediaFormat constants if these get exposed through the API. See [redacted].
+  // TODO: Use MediaFormat constants if these get exposed through the API. See [Internal: b/14127601].
   private static final String KEY_CROP_LEFT = "crop-left";
   private static final String KEY_CROP_RIGHT = "crop-right";
   private static final String KEY_CROP_BOTTOM = "crop-bottom";
diff --git a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
index 1229e87d5b..ad5308d7c0 100644
--- a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
@@ -583,7 +583,7 @@ public final class FragmentedMp4Extractor implements Extractor {
       if (atomType == Atom.TYPE_mp4a || atomType == Atom.TYPE_enca) {
         if (childAtomType == Atom.TYPE_esds) {
           initializationData = parseEsdsFromParent(parent, childStartPosition);
-          // TODO: Do we really need to do this? See [redacted]
+          // TODO: Do we really need to do this? See [Internal: b/10903778]
           // Update sampleRate and channelCount from the AudioSpecificConfig initialization data.
           Pair<Integer, Integer> audioSpecificConfig =
               CodecSpecificDataUtil.parseAudioSpecificConfig(initializationData);
diff --git a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
index 26ed0145c4..4fd581bf56 100644
--- a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
@@ -247,7 +247,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
   @Override
   protected boolean isReady() {
     // Don't block playback whilst subtitles are loading.
-    // Note: To change this behavior, it will be necessary to consider [redacted].
+    // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
     return true;
   }