Snap for 8389696 from 0dd11c007840f993e3defdb32e8dde830543299f to tm-d2-release

Change-Id: I68b14fa2d5682687e1f7b647492b2e43ac4c2733