Snap for 8857176 from 5222442817da3604fa53466d2b9c185e42295827 to mainline-go-scheduling-release

Change-Id: Id13263dd17e7ad9983f984307bd4f6bdf89b0d89