Snap for 8881119 from 58137990bb14cdac7b0e368bc8e3b92081dc2d2a to tm-d2-release

Change-Id: I591f65248d650532a3d1fddfe14d329933013ffe