Snap for 8505378 from 20b039192d90f6dcbce3905cfe108c5ba8205440 to mainline-go-scheduling-release

Change-Id: Iaa19f9a366ead5d9518b240d0d8f42d8cfc2a5df