Snap for 5778794 from 1d85de658cdf882f367c485feb9d5ef5f87b14f0 to qt-qpr1-release

Change-Id: Ie812697812e1d0b5000b4be96f0bc081e0d7db93