Snap for 8389696 from 76fcb4dda691aef94a73d1c23e4309be70753005 to tm-d2-release

Change-Id: I48a67eb1203742da0cf3041c983695caf4a3e883