Snap for 8736029 from 683bdac642bc8e7322c71aede4c8880301f8da86 to mainline-go-scheduling-release

Change-Id: I4de76c77afa6a2463f2e1ebe673d1693c1ea040d