Merge "Upstream changes from Codec2 MTS"