Snap for 6047316 from bb6ead3c3abc2802765704fa7378c5c6c519c745 to qt-qpr2-release

Change-Id: If948b5c4564df4c3027f26e16ca2ce15f9ef6d92