Snap for 8570526 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-scheduling-release

Change-Id: Ie79503e9cf079d3dd5df1edf3eaf0097ea80aea2