Snap for 9200392 from 7ab6cbe3adbd6a7e4a56580e82c8dc2bbee2fb9b to tm-d4-release

Change-Id: Ie87f3ce1cc28ca47ad01d5b943965c2ea9ffd57b