Snap for 8745897 from 352ffb116e26a9d5a0b6d56edb380e1190c4bf68 to tm-frc-scheduling-release

Change-Id: I9b9739e99a0a31267de4e461eb92938490131bc1