Snap for 8023588 from 6b4a1303bbbf49ed47f3c3a47212a81f90330b69 to tm-d1-release

Change-Id: I3c0afd0718a0e6348cc9ad7981588dbb2313befe