Snap for 8023588 from 4e22457b28cf54f96d91492b3c58fe887810f98c to tm-d1-release

Change-Id: Ibe15ffd555726cf7af26dc8be71361d3184e0e64