Snap for 8736029 from 10440879cbe2729d42b891e55d52602cc2c4b446 to mainline-go-scheduling-release

Change-Id: I9341a7ab8ffe06e74ec787f96a410151a7b69b45