Snap for 7912506 from eea590cab898a3cbae5f05bbf571b14b2e3a7de6 to tm-d1-release

Change-Id: I22f94db739a3fbfbc027d2a30e153ebd182b64cd