Snap for 5867030 from 521f845b172c9df6f2d407f6b3fcaec48a20cf97 to qt-qpr1-release

Change-Id: I15c632a7847a44052c81571cc7b054f4f80f671f