[Cin] Latest GIT checkin includes FFmpeg upgrade + Masking