Snap for 8389696 from 945090601a0dea63ca45560aa60b959aaff103ac to tm-d2-release Change-Id: I1e1ca572de3c09f501f14baedf080fac2617fadf