diff --git a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4
index 5563a0bcff..afaf011f5d 100644
Binary files a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 and b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4
index 3e22310eb5..6f7bb1256a 100644
Binary files a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 and b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
index 199300a080..8f7f6e2517 100644
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
@@ -7,7 +7,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="342199" codecs="vp08.00.00.08.01.01.00.00" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="340983" codecs="vp08.00.00.08.01.01.00.00" mimeType="video/mp4" sar="1:1">
         <BaseURL>output_video.mp4</BaseURL>
         <SegmentBase indexRange="1019-1086" timescale="1000000">
           <Initialization range="0-1018"/>
diff --git a/packager/media/crypto/encryption_handler.cc b/packager/media/crypto/encryption_handler.cc
index 138ad13bc2..3d76288eb9 100644
--- a/packager/media/crypto/encryption_handler.cc
+++ b/packager/media/crypto/encryption_handler.cc
@@ -141,9 +141,6 @@ Status EncryptionHandler::ProcessStreamInfo(StreamInfo* stream_info) {
       *stream_info, encryption_options_.max_sd_pixels,
       encryption_options_.max_hd_pixels, encryption_options_.max_uhd1_pixels);
   switch (video_codec_) {
-    case kCodecVP8:
-      vpx_parser_.reset(new VP8Parser);
-      break;
     case kCodecVP9:
       vpx_parser_.reset(new VP9Parser);
       break;
@@ -156,7 +153,7 @@ Status EncryptionHandler::ProcessStreamInfo(StreamInfo* stream_info) {
       header_parser_.reset(new H265VideoSliceHeaderParser);
       break;
     default:
-      // Expect an audio codec with nalu length size == 0.
+      // Other codecs should have nalu length size == 0.
       if (nalu_length_size_ > 0) {
         LOG(WARNING) << "Unknown video codec '" << video_codec_ << "'";
         return Status(error::ENCRYPTION_FAILURE, "Unknown video codec.");
@@ -299,9 +296,10 @@ bool EncryptionHandler::CreateEncryptor(EncryptionKey* encryption_key) {
   return initialized;
 }
 
-bool EncryptionHandler::EncryptVpxFrame(const std::vector<VPxFrameInfo>& vpx_frames,
-                                        MediaSample* sample,
-                                        DecryptConfig* decrypt_config) {
+bool EncryptionHandler::EncryptVpxFrame(
+    const std::vector<VPxFrameInfo>& vpx_frames,
+    MediaSample* sample,
+    DecryptConfig* decrypt_config) {
   uint8_t* data = sample->writable_data();
   const bool is_superframe = vpx_frames.size() > 1;
   for (const VPxFrameInfo& frame : vpx_frames) {
@@ -317,12 +315,10 @@ bool EncryptionHandler::EncryptVpxFrame(const std::vector<VPxFrameInfo>& vpx_fra
     // ISO/IEC 23001-7:2016 10.2 'cbc1' 10.3 'cens'
     // The BytesOfProtectedData size SHALL be a multiple of 16 bytes to
     // avoid partial blocks in Subsamples.
-    if (is_superframe || encryption_options_.protection_scheme == FOURCC_cbc1 ||
-        encryption_options_.protection_scheme == FOURCC_cens) {
-      const uint16_t misalign_bytes = cipher_bytes % kCencBlockSize;
-      clear_bytes += misalign_bytes;
-      cipher_bytes -= misalign_bytes;
-    }
+    // For consistency, apply block alignment to all frames.
+    const uint16_t misalign_bytes = cipher_bytes % kCencBlockSize;
+    clear_bytes += misalign_bytes;
+    cipher_bytes -= misalign_bytes;
 
     decrypt_config->AddSubsample(clear_bytes, cipher_bytes);
     if (cipher_bytes > 0)
diff --git a/packager/media/formats/mp4/encrypting_fragmenter.cc b/packager/media/formats/mp4/encrypting_fragmenter.cc
index 7fa2e1e911..351e8156f3 100644
--- a/packager/media/formats/mp4/encrypting_fragmenter.cc
+++ b/packager/media/formats/mp4/encrypting_fragmenter.cc
@@ -79,9 +79,6 @@ EncryptingFragmenter::EncryptingFragmenter(
       listener_(listener) {
   DCHECK(encryption_key_);
   switch (video_codec_) {
-    case kCodecVP8:
-      vpx_parser_.reset(new VP8Parser);
-      break;
     case kCodecVP9:
       vpx_parser_.reset(new VP9Parser);
       break;
@@ -280,13 +277,10 @@ Status EncryptingFragmenter::EncryptSample(
         // ISO/IEC 23001-7:2016 10.2 'cbc1' 10.3 'cens'
         // The BytesOfProtectedData size SHALL be a multiple of 16 bytes to
         // avoid partial blocks in Subsamples.
-        if (is_superframe || protection_scheme_ == FOURCC_cbc1 ||
-            protection_scheme_ == FOURCC_cens) {
-          const uint16_t misalign_bytes =
-              subsample.cipher_bytes % kCencBlockSize;
-          subsample.clear_bytes += misalign_bytes;
-          subsample.cipher_bytes -= misalign_bytes;
-        }
+        // For consistency, apply block alignment to all frames.
+        const uint16_t misalign_bytes = subsample.cipher_bytes % kCencBlockSize;
+        subsample.clear_bytes += misalign_bytes;
+        subsample.cipher_bytes -= misalign_bytes;
 
         sample_encryption_entry.subsamples.push_back(subsample);
         if (subsample.cipher_bytes > 0)