Snap for 8736029 from 5ace5ab2ad6fe67078ad1f12ec571db5c7f52838 to mainline-go-scheduling-release

Change-Id: I283600f544fbb25b6d07e7dabab1ab4798ddcca1