Snap for 7629113 from 61cc8e5ba45e9558c104a928f932fc0a1a837c25 to tm-release

Change-Id: Ic575af3182338595569c4a367391a725f8ab1dc7