Snap for 8570526 from 7b50b3f18e06b9e9b78bd4487e7cdfbe1982391f to mainline-scheduling-release

Change-Id: Ie7740208ac016f7eb70c5695d702325cd23f0a84