Snap for 9305793 from 633deeefb66c3ca6e6ef50145c345db5c3096c42 to tm-qpr2-release

Change-Id: Ibe844d892d2bd0372266c7f17d93a562a5bacbc9