Snap for 7825444 from 154601057d295b8a17ad4f23c655cc68d6b352b3 to tm-release

Change-Id: I4fbf1b02b4691e6abcb1a192f1dc4eadf939a978