diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts
index 2239833e63..780f4ba5e8 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts
index 2c27268df7..9410bc3c7a 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts
index d5231acb66..0176465663 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts
index ed0773cdce..5d4aad179c 100644
Binary files a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts
index 7bfbd65428..aab439e683 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts
index 5e26cda10f..e70a53bdf2 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts
index 244009c822..5e192f321b 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts
index 6b44b167a1..46717de247 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts
index dfe8812409..3d6bb36dee 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts and b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts
index 7bfbd65428..aab439e683 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts
index babb8b6e83..02753965d4 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts
index 158af46119..1a8609f3e9 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts
index d5231acb66..0176465663 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts
index ed0773cdce..5d4aad179c 100644
Binary files a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts and b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts
index 6b44b167a1..46717de247 100644
Binary files a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts
index dfe8812409..3d6bb36dee 100644
Binary files a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts and b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts
index 6b44b167a1..46717de247 100644
Binary files a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts and b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts
index dfe8812409..3d6bb36dee 100644
Binary files a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts and b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts
index 2239833e63..780f4ba5e8 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts
index 2c27268df7..9410bc3c7a 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts
index d5231acb66..0176465663 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts
index ed0773cdce..5d4aad179c 100644
Binary files a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts
index d83b3a5650..ba236d387a 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts
index cb0357335f..7a100a7bb4 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts
index 4e9ae7acba..43a99024f1 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts
index 742b3b1830..77fc2d144a 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts
index 2239833e63..780f4ba5e8 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts
index 2c27268df7..9410bc3c7a 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts
index d5231acb66..0176465663 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts
index ed0773cdce..5d4aad179c 100644
Binary files a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts
index cd9a366a41..57e0586965 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts
index dabd5b90dc..145cade9d6 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts
index 6b44b167a1..46717de247 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts
index dfe8812409..3d6bb36dee 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts
index 6534c169de..1857e63949 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts
index 4f83164ce9..70724a8027 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts
index 708de44a09..0e12016b82 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts
index b224e708c4..24ce491337 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts
index b0c2de6691..abbcec53fc 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts
index 54d6b573bf..10ed0748c1 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts
index 5dd10d6c49..142fb332ed 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts
index cd9a366a41..57e0586965 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts
index dabd5b90dc..145cade9d6 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts
index 84a65fef8a..898a88817d 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts
index 6b44b167a1..46717de247 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts
index dfe8812409..3d6bb36dee 100644
Binary files a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts differ
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts
index 4e73a20026..26f4e38f24 100644
Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts differ
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts
index 179b1b387d..821bc1416e 100644
Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts differ
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts
index e4eb714d7e..d65498c144 100644
Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts
index 756660723c..0c813b4d7e 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts
index 4acfb4f0d2..632089df67 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts
index 09dbdb3523..5b9aba10f6 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts
index 6bb890b64d..1e912b23cf 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts
index 1614576aa2..4e3ad5ba38 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts differ
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts
index 4f6728a0e9..abf234e938 100644
Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts differ
diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.cc b/packager/media/formats/mp2t/ts_packet_writer_util.cc
index 8abf156f56..cb7f507acf 100644
--- a/packager/media/formats/mp2t/ts_packet_writer_util.cc
+++ b/packager/media/formats/mp2t/ts_packet_writer_util.cc
@@ -97,7 +97,7 @@ void WriteAdaptationField(bool has_pcr,
     const uint32_t most_significant_32bits_pcr =
         static_cast<uint32_t>(pcr_base >> 1);
     const uint16_t pcr_last_bit_reserved_and_pcr_extension =
-        ((pcr_base & 1) << 15);
+        ((pcr_base & 1) << 15) | 0x7e00;  // Set the 6 reserved bits to '1'
     writer->AppendInt(most_significant_32bits_pcr);
     writer->AppendInt(pcr_last_bit_reserved_and_pcr_extension);
     remaining_bytes -= kPcrFieldsSize;
diff --git a/packager/media/formats/mp2t/ts_writer_unittest.cc b/packager/media/formats/mp2t/ts_writer_unittest.cc
index b2d5582c22..cac05aef8f 100644
--- a/packager/media/formats/mp2t/ts_writer_unittest.cc
+++ b/packager/media/formats/mp2t/ts_writer_unittest.cc
@@ -319,7 +319,7 @@ TEST_F(TsWriterTest, AddPesPacket) {
       0x30,  // Adaptation field and payload are both present. counter = 0.
       0xA0,  // Adaptation Field length.
       0x10,  // pcr flag.
-      0x00, 0x00, 0x04, 0x80, 0x00, 0x00,  // PCR.
+      0x00, 0x00, 0x04, 0x80, 0x7e, 0x00,  // PCR.
   };
 
   const uint8_t kExpectedPayload[] = {
@@ -411,7 +411,7 @@ TEST_F(TsWriterTest, PesPtsZeroNoDts) {
       0x30,  // Adaptation field and payload are both present. counter = 0.
       0xA5,  // Adaptation Field length.
       0x10,  // pcr flag.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // PCR.
+      0x00, 0x00, 0x00, 0x00, 0x7e, 0x00,  // PCR.
   };
 
   const uint8_t kExpectedPayload[] = {