Snap for 8680285 from 3697166a0a033370e5ca7334c9d5cb0e64d86585 to mainline-go-scheduling-release

Change-Id: I2db53937481aa5078b0c31e456f1bcc36b8a441b