Merge pull request #12007 from crosbymichael/fix-oom-hang

Return closed channel if oom notification fails