Snap for 8512216 from 2b803731c01caa4523f7644fd106730556fd97db to tm-frc-media-release

Change-Id: I1f089b25f5b9f729ad316319bda243551c19e590