Include additional changes for media processing

@rongyan please review