Snap for 8977768 from 6d9cb1744e8dbaa7304372e8f26df38c20e301e4 to tm-qpr1-release

Change-Id: Id24ca598dec07b72aafb1d522c4cf9da33746478