Merge "Remove cgroup_desc_file bugs." into main