Automatic merge from submit-queue

Scheduler map reduce 3

Ref https://github.com/kubernetes/kubernetes/issues/24246