Snap for 7673994 from c9cdaae3e1080c501b2570a3262b472d4a046e8b to tm-release

Change-Id: I4e01163868670f8beacc9d785003e5b7ecc5d46e