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

Change-Id: I34760950f0973603a3baedaef3e33ba349a726fa