Snap for 9447015 from e8caf207c2e7c08f550daaee3a5e2331848ffd01 to tm-d2-release

Change-Id: I7c03b6b396251bdcf15fd397204fa6cbee63892f