Snap for 8191477 from ee86670715b2f28028e6c270e07dcbd56882c5ec to tm-frc-media-release

Change-Id: Ief3ae36e10d34832b821ef791a2f49a279a0b892