Snap for 5490587 from ceaa4b38bb534297e3297bc43335b217e7cf9cf6 to qt-release

Change-Id: Idd70588b9e8870d27a163e5d1d4318e2f436c7e8