Snap for 8736029 from 710e5b908991f74c87135b51ab13b053277a8fdd to mainline-go-scheduling-release

Change-Id: Ibc5d2e2b956fcef17ed310ba5f2c7794202ac4da