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

Change-Id: I776d4086476c7615d9f13b6e258506fc45ada81b