Snap for 8603585 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-scheduling-release

Change-Id: If917af22c7d243bd616f09f5de9509b657f49770