Snap for 7655068 from c787c1886761199c3c2070ce39a9c3993b7d221f to tm-release

Change-Id: I85a6e50c990d52fcc1f9a662f0678d89e7a03c58