Snap for 7473608 from 300225f3e9561e02d6abe8050fb341ee8b4891a3 to tm-d1-release

Change-Id: I2b791c46ce07a909212e8f87c701c076a3ce3aa0