Snap for 9316743 from 3b6a233eba04571ea6178d0c49e126b099de1b30 to tm-d4-release

Change-Id: Ib04416dd10177f0131cc0dcf761696ddaca5fb72