Merge "uid for codec process"