Snap for 5892339 from 3964c804f9618dec6f141c0642e0b772a25560b3 to qt-qpr1-release

Change-Id: Id5501d55c127c7e01e2fb321396cce77b18f2987