Snap for 5691478 from 8e3b94c2e296f1d23b49e1a61d20f3ebf8f417b5 to qt-qpr1-release

Change-Id: I091613807dad197199709273960130fce78ae8fa