Snap for 6103831 from aa4551ba8fa048d5fa0c1f55d991d762c7ef9ecc to qt-qpr2-release

Change-Id: I858614fafd95d7332af344cafaeb89d883cfb44b