Snap for 8061476 from e5cb1d2b109a688a0af058ea5f441cae8b9a2b2c to tm-d1-release

Change-Id: Ia1207a90093db94ee3f2fff2e0a52ac87ffc448a