Snap for 8736029 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-scheduling-release

Change-Id: I898d3d716fc91b69ac3ecd01460332178281bac4