Snap for 8769052 from 839ec5639aceebbe83a9448433f2fdd6b698c18a to tm-d2-release

Change-Id: Ib500dea765cc3f6082cde01f8ca89acd84666175