Snap for 5626731 from 6bc8d9a464f32916da62988c2cc758b33df99711 to qt-release

Change-Id: I66794064c0d894675464222d7ceb532f5ab654ff