Snap for 5246489 from bcee83eb1d41dd335b3a4af7040834032da5f8fe to qt-release

Change-Id: I0d3aa2e945c57457fbd64190f0e2d7ffca4aa8c6