Snap for 5652667 from 88adf9153093baa6cf5c71a6191b330d80ca5279 to qt-qpr1-release

Change-Id: I12738c65c9a9f52903260eda7355f7d50908ad6c