Snap for 8570526 from 2c4aae921b1f305c1be07d134a0393ae79e5ede5 to mainline-scheduling-release

Change-Id: I2366be0403edeff782e509dab1dea65c8bc0a095