Merge "Update cgroups"