Snap for 9424627 from 437223deec2dcd5e46ed984217a7d727e42c697d to tm-qpr2-release

Change-Id: Iba477c06640299c21e862d763bb097a67e828036