Snap for 8345013 from 945090601a0dea63ca45560aa60b959aaff103ac to tm-d1-release Change-Id: If380234180919c43b6cebcbbbd42e61ae92df1d7