Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-scheduling-release

Change-Id: I3a3258df3859da67ed885eb83a52deab7e40523a