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

Change-Id: Ie1ce358b3a1152b94a3cbf5b9f3064aa0dc99071