Snap for 8046958 from 0a3fff4ba4800ee303f7f0e7692329e7957e6a56 to tm-d1-release

Change-Id: I765cbb528bbb70264414f21d429cff8184302a47