Snap for 8512216 from c8e4ab2b22cf6551c6c464df7f261ed4d3b659a6 to tm-frc-scheduling-release

Change-Id: Idcd6c7b8ea15f51805dcef0336b04aa1c156e689