Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-dev