Snap for 5667727 from 320211cbba531983d3646085adc1da11f4d15fae to qt-qpr1-release

Change-Id: I4648df6648df8652fa2700532494700229583da7