Snap for 8512216 from 134994aa018e129c4bca68272a1cb9f6144de116 to tm-frc-media-release

Change-Id: I7685d5de2948066ad170f021f70614b15fa9c06e