Snap for 5895359 from 99f04da5dcafe634ca3b6a5529bad0808223b557 to qt-qpr1-release

Change-Id: I7f5bad0312f19434bc19fc8238a517973f070fb2