Snap for 7671452 from a9588741eabfc8c72c7d9a07d840b70577de8256 to tm-d1-release

Change-Id: Iafe7d565598598fed04c61d8bd7fcb3c89aa5e01