diff --git a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4
index b98897e81a..e838224228 100644
Binary files a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 differ
diff --git a/packager/media/codecs/h265_parser.cc b/packager/media/codecs/h265_parser.cc
index 7fc344267f..b1b68663dd 100644
--- a/packager/media/codecs/h265_parser.cc
+++ b/packager/media/codecs/h265_parser.cc
@@ -236,6 +236,8 @@ H265Parser::Result H265Parser::ParseSliceHeader(const Nalu& nalu,
         TRUE_OR_RETURN(
             br->ReadBits(ceil(log2(sps->num_short_term_ref_pic_sets)),
                          &slice_header->short_term_ref_pic_set_idx));
+        TRUE_OR_RETURN(slice_header->short_term_ref_pic_set_idx <
+                       sps->num_short_term_ref_pic_sets);
       }
 
       if (sps->long_term_ref_pic_present_flag) {
@@ -390,6 +392,8 @@ H265Parser::Result H265Parser::ParseSliceHeader(const Nalu& nalu,
     TRUE_OR_RETURN(br->SkipBits(extension_length * 8));
   }
 
+  OK_OR_RETURN(ByteAlignment(br));
+
   slice_header->header_bit_size = nalu.payload_size() * 8 - br->NumBitsLeft();
   return kOk;
 }
@@ -832,7 +836,9 @@ H265Parser::Result H265Parser::ParseReferencePictureSet(
     }
   } else {
     TRUE_OR_RETURN(br->ReadUE(&out_ref_pic_set->num_negative_pics));
+    TRUE_OR_RETURN(out_ref_pic_set->num_negative_pics <= kMaxRefPicSetCount);
     TRUE_OR_RETURN(br->ReadUE(&out_ref_pic_set->num_positive_pics));
+    TRUE_OR_RETURN(out_ref_pic_set->num_positive_pics <= kMaxRefPicSetCount);
 
     int prev_poc = 0;
     for (int i = 0; i < out_ref_pic_set->num_negative_pics; i++) {
@@ -1107,5 +1113,11 @@ H265Parser::Result H265Parser::SkipSubLayerHrdParameters(
   return kOk;
 }
 
+H265Parser::Result H265Parser::ByteAlignment(H26xBitReader* br) {
+  TRUE_OR_RETURN(br->SkipBits(1));
+  TRUE_OR_RETURN(br->SkipBits(br->NumBitsLeft() % 8));
+  return kOk;
+}
+
 }  // namespace media
 }  // namespace shaka
diff --git a/packager/media/codecs/h265_parser.h b/packager/media/codecs/h265_parser.h
index 5b0253a33f..6eae120d1a 100644
--- a/packager/media/codecs/h265_parser.h
+++ b/packager/media/codecs/h265_parser.h
@@ -351,6 +351,8 @@ class H265Parser {
                                    bool sub_pic_hdr_params_present_flag,
                                    H26xBitReader* br);
 
+  Result ByteAlignment(H26xBitReader* br);
+
   typedef std::map<int, std::unique_ptr<H265Sps>> SpsById;
   typedef std::map<int, std::unique_ptr<H265Pps>> PpsById;
 
diff --git a/packager/media/codecs/h265_parser_unittest.cc b/packager/media/codecs/h265_parser_unittest.cc
index 55ec82f9b8..063f2f5a8b 100644
--- a/packager/media/codecs/h265_parser_unittest.cc
+++ b/packager/media/codecs/h265_parser_unittest.cc
@@ -55,7 +55,7 @@ TEST(H265ParserTest, ParseSliceHeader) {
   EXPECT_EQ(8, header.slice_qp_delta);
   EXPECT_FALSE(header.cu_chroma_qp_offset_enabled_flag);
   EXPECT_EQ(5, header.num_entry_point_offsets);
-  EXPECT_EQ(85u, header.header_bit_size);
+  EXPECT_EQ(88u, header.header_bit_size);
 }
 
 TEST(H265ParserTest, ParseSliceHeader_NonIDR) {
@@ -81,7 +81,7 @@ TEST(H265ParserTest, ParseSliceHeader_NonIDR) {
   EXPECT_FALSE(header.dependent_slice_segment_flag);
   EXPECT_EQ(1, header.slice_type);
   EXPECT_EQ(5, header.num_entry_point_offsets);
-  EXPECT_EQ(124u, header.header_bit_size);
+  EXPECT_EQ(128u, header.header_bit_size);
 }
 
 TEST(H265ParserTest, ParseSps) {
diff --git a/packager/media/codecs/h26x_bit_reader_unittest.cc b/packager/media/codecs/h26x_bit_reader_unittest.cc
index f15b866e3f..0dff514765 100644
--- a/packager/media/codecs/h26x_bit_reader_unittest.cc
+++ b/packager/media/codecs/h26x_bit_reader_unittest.cc
@@ -95,6 +95,8 @@ TEST(H26xBitReaderTest, SkipBits) {
   EXPECT_EQ(0x15, dummy);
   EXPECT_EQ(4, reader.NumBitsLeft());
   EXPECT_FALSE(reader.SkipBits(5));
+  EXPECT_TRUE(reader.SkipBits(0));
+  EXPECT_EQ(4, reader.NumBitsLeft());
 }
 
 TEST(H26xBitReaderTest, StopBitOccupyFullByte) {