Snap for 7671334 from 36884a3e48ae5128d2b5753d8deedee1f8f6c233 to tm-release

Change-Id: I5542cb49160f557029e9104ecd78b1c8ab90e07f