Snap for 8191477 from 9212bfaf3a559ad72829f5ade0b15083af10d275 to tm-frc-scheduling-release

Change-Id: I701ee71b083dfef1edbeff52b86ac43c1e28d0c7