Snap for 9446458 from ab90ee56c3fce4bc7c9a2981acdae3d842b4cf01 to tm-qpr2-release

Change-Id: Ia5e5757c87f079fbfd3141ad1a78175551b199d1