Snap for 8610053 from 0ab7496c953676ece02843b0b3c6c66bb2ce7b00 to tm-frc-scheduling-release

Change-Id: I57fae93b8675634636b894eba51aedd98b42f6ab