Snap for 8736029 from 4dd726e68d5d58f6d8c5a0c006c6f9895eb8cc8f to mainline-go-scheduling-release

Change-Id: Ib467ffb1f5cf2a4576c9b4e4021bee840ad7b78b