Snap for 8570526 from af6e4abba82e7811dbfe7dc7b93e146946bd7c78 to mainline-scheduling-release

Change-Id: I8e62359ba5824285727f2652066c7f5c9079963d