Merge "Kill services even when cgroups is disabled"