Merge "Snap for 5652667 from 0bf9256bb3b89abaec28280c7d1bd5078c448275 to qt-qpr1-release" into qt-qpr1-release am: 5d570d1e57

Change-Id: If2c1f6701ecb0231ef17907c0ac31d3ff09c1e6d