Snap for 8708169 from 4745695a5f4f0e5c787b748f18ccd165914ede75 to mainline-go-scheduling-release

Change-Id: If00eab90cee018b06fde8267a4a8a21e9a87a5b5