Snap for 8857176 from 1ce5be5b7d6e5e8b0634492723ca57fd3bb86e83 to mainline-go-scheduling-release

Change-Id: I4403cd5a6751cf8f43e5c6b8e0b435005e11ce62