Snap for 8191477 from b345902525130ad6ebbe052cae74cc673a5df93c to tm-frc-scheduling-release

Change-Id: Icd44332eb34f495a48504f8d27f0c8ba1d7e309c