diff --git a/libraries/common/src/main/java/androidx/media3/common/text/Cue.java b/libraries/common/src/main/java/androidx/media3/common/text/Cue.java
index d5d4b0148f..68a08ed0cb 100644
--- a/libraries/common/src/main/java/androidx/media3/common/text/Cue.java
+++ b/libraries/common/src/main/java/androidx/media3/common/text/Cue.java
@@ -847,10 +847,14 @@ public final class Cue implements Bundleable {
   @Override
   public Bundle toBundle() {
     Bundle bundle = new Bundle();
-    bundle.putCharSequence(FIELD_TEXT, text);
+    if (text != null) {
+      bundle.putCharSequence(FIELD_TEXT, text);
+    }
     bundle.putSerializable(FIELD_TEXT_ALIGNMENT, textAlignment);
     bundle.putSerializable(FIELD_MULTI_ROW_ALIGNMENT, multiRowAlignment);
-    bundle.putParcelable(FIELD_BITMAP, bitmap);
+    if (bitmap != null) {
+      bundle.putParcelable(FIELD_BITMAP, bitmap);
+    }
     bundle.putFloat(FIELD_LINE, line);
     bundle.putInt(FIELD_LINE_TYPE, lineType);
     bundle.putInt(FIELD_LINE_ANCHOR, lineAnchor);
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump
index 17f67bbbef..9e670450ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3017
+  total output bytes = 2954
   sample count = 3
   format 0:
     id = 3
@@ -278,13 +278,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 1002, hash 83D96DE7
+    data = length 981, hash 3A70FBFA
   sample 1:
     time = 150000
     flags = 1
-    data = length 1007, hash BFF2DCF4
+    data = length 986, hash 8CA3E471
   sample 2:
     time = 200000
     flags = 1
-    data = length 1008, hash 2B5F6191
+    data = length 987, hash 156157B4
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump
index 17f67bbbef..9e670450ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3017
+  total output bytes = 2954
   sample count = 3
   format 0:
     id = 3
@@ -278,13 +278,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 1002, hash 83D96DE7
+    data = length 981, hash 3A70FBFA
   sample 1:
     time = 150000
     flags = 1
-    data = length 1007, hash BFF2DCF4
+    data = length 986, hash 8CA3E471
   sample 2:
     time = 200000
     flags = 1
-    data = length 1008, hash 2B5F6191
+    data = length 987, hash 156157B4
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump
index 17f67bbbef..9e670450ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3017
+  total output bytes = 2954
   sample count = 3
   format 0:
     id = 3
@@ -278,13 +278,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 1002, hash 83D96DE7
+    data = length 981, hash 3A70FBFA
   sample 1:
     time = 150000
     flags = 1
-    data = length 1007, hash BFF2DCF4
+    data = length 986, hash 8CA3E471
   sample 2:
     time = 200000
     flags = 1
-    data = length 1008, hash 2B5F6191
+    data = length 987, hash 156157B4
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump
index 17f67bbbef..9e670450ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3017
+  total output bytes = 2954
   sample count = 3
   format 0:
     id = 3
@@ -278,13 +278,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 1002, hash 83D96DE7
+    data = length 981, hash 3A70FBFA
   sample 1:
     time = 150000
     flags = 1
-    data = length 1007, hash BFF2DCF4
+    data = length 986, hash 8CA3E471
   sample 2:
     time = 200000
     flags = 1
-    data = length 1008, hash 2B5F6191
+    data = length 987, hash 156157B4
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump
index 17f67bbbef..9e670450ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3017
+  total output bytes = 2954
   sample count = 3
   format 0:
     id = 3
@@ -278,13 +278,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 1002, hash 83D96DE7
+    data = length 981, hash 3A70FBFA
   sample 1:
     time = 150000
     flags = 1
-    data = length 1007, hash BFF2DCF4
+    data = length 986, hash 8CA3E471
   sample 2:
     time = 200000
     flags = 1
-    data = length 1008, hash 2B5F6191
+    data = length 987, hash 156157B4
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump
index 214fd0b78f..9b9401f093 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3002
+  total output bytes = 2939
   sample count = 3
   format 0:
     id = 3
@@ -281,13 +281,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 997, hash A1198858
+    data = length 976, hash 91D1729
   sample 1:
     time = 150000
     flags = 1
-    data = length 1002, hash E686A781
+    data = length 981, hash 1B9102A8
   sample 2:
     time = 200000
     flags = 1
-    data = length 1003, hash 27A316D2
+    data = length 982, hash 263F7393
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump
index 214fd0b78f..9b9401f093 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3002
+  total output bytes = 2939
   sample count = 3
   format 0:
     id = 3
@@ -281,13 +281,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 997, hash A1198858
+    data = length 976, hash 91D1729
   sample 1:
     time = 150000
     flags = 1
-    data = length 1002, hash E686A781
+    data = length 981, hash 1B9102A8
   sample 2:
     time = 200000
     flags = 1
-    data = length 1003, hash 27A316D2
+    data = length 982, hash 263F7393
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump
index 214fd0b78f..9b9401f093 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3002
+  total output bytes = 2939
   sample count = 3
   format 0:
     id = 3
@@ -281,13 +281,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 997, hash A1198858
+    data = length 976, hash 91D1729
   sample 1:
     time = 150000
     flags = 1
-    data = length 1002, hash E686A781
+    data = length 981, hash 1B9102A8
   sample 2:
     time = 200000
     flags = 1
-    data = length 1003, hash 27A316D2
+    data = length 982, hash 263F7393
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump
index 214fd0b78f..9b9401f093 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3002
+  total output bytes = 2939
   sample count = 3
   format 0:
     id = 3
@@ -281,13 +281,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 997, hash A1198858
+    data = length 976, hash 91D1729
   sample 1:
     time = 150000
     flags = 1
-    data = length 1002, hash E686A781
+    data = length 981, hash 1B9102A8
   sample 2:
     time = 200000
     flags = 1
-    data = length 1003, hash 27A316D2
+    data = length 982, hash 263F7393
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump
index 214fd0b78f..9b9401f093 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 3002
+  total output bytes = 2939
   sample count = 3
   format 0:
     id = 3
@@ -281,13 +281,13 @@ track 3:
   sample 0:
     time = 100000
     flags = 1
-    data = length 997, hash A1198858
+    data = length 976, hash 91D1729
   sample 1:
     time = 150000
     flags = 1
-    data = length 1002, hash E686A781
+    data = length 981, hash 1B9102A8
   sample 2:
     time = 200000
     flags = 1
-    data = length 1003, hash 27A316D2
+    data = length 982, hash 263F7393
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump
index 569ea4de3a..a0c3b4ab9f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 993
+  total output bytes = 972
   sample count = 1
   format 0:
     id = 3
@@ -279,5 +279,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 993, hash E926FD1E
+    data = length 972, hash 8E8A2E4B
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump
index 569ea4de3a..a0c3b4ab9f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 993
+  total output bytes = 972
   sample count = 1
   format 0:
     id = 3
@@ -279,5 +279,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 993, hash E926FD1E
+    data = length 972, hash 8E8A2E4B
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump
index 569ea4de3a..a0c3b4ab9f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 993
+  total output bytes = 972
   sample count = 1
   format 0:
     id = 3
@@ -279,5 +279,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 993, hash E926FD1E
+    data = length 972, hash 8E8A2E4B
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump
index 569ea4de3a..a0c3b4ab9f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 993
+  total output bytes = 972
   sample count = 1
   format 0:
     id = 3
@@ -279,5 +279,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 993, hash E926FD1E
+    data = length 972, hash 8E8A2E4B
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump
index 569ea4de3a..a0c3b4ab9f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 993
+  total output bytes = 972
   sample count = 1
   format 0:
     id = 3
@@ -279,5 +279,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 993, hash E926FD1E
+    data = length 972, hash 8E8A2E4B
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump
index ee325461f2..2f2ddb304c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 1280
+  total output bytes = 1259
   sample count = 1
   format 0:
     id = 3
@@ -281,5 +281,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 1280, hash EEF152A1
+    data = length 1259, hash C880769E
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump
index ee325461f2..2f2ddb304c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 1280
+  total output bytes = 1259
   sample count = 1
   format 0:
     id = 3
@@ -281,5 +281,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 1280, hash EEF152A1
+    data = length 1259, hash C880769E
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump
index ee325461f2..2f2ddb304c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 1280
+  total output bytes = 1259
   sample count = 1
   format 0:
     id = 3
@@ -281,5 +281,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 1280, hash EEF152A1
+    data = length 1259, hash C880769E
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump
index ee325461f2..2f2ddb304c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 1280
+  total output bytes = 1259
   sample count = 1
   format 0:
     id = 3
@@ -281,5 +281,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 1280, hash EEF152A1
+    data = length 1259, hash C880769E
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump
index ee325461f2..2f2ddb304c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump
@@ -267,7 +267,7 @@ track 2:
     flags = 1
     data = length 418, hash 56AB8D37
 track 3:
-  total output bytes = 1280
+  total output bytes = 1259
   sample count = 1
   format 0:
     id = 3
@@ -281,5 +281,5 @@ track 3:
   sample 0:
     time = 0
     flags = 1
-    data = length 1280, hash EEF152A1
+    data = length 1259, hash C880769E
 tracksEnded = true