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

Change-Id: I8600aadeea08b923ca0dac0843843845b08ca11e