Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-dev