Snap for 8736029 from c8aec5c18160241e9b5bc79bbc3580e13df5ab23 to mainline-go-scheduling-release

Change-Id: I4c13f0bdb5cc383598e5c238c19a25f9a736732b