Snap for 7825444 from 31fb35b8f4fd6c083567c884264d0f3bb28bd4bf to tm-release

Change-Id: I1b107b9d0615b5838c30c260779b0e5add2f75f5