Snap for 7945036 from 282536d1775e7e8b9450b450a1443e1f164b8a03 to tm-release

Change-Id: I02e8a6ecab316db823e77a4636b3eaab8952903f