Snap for 4869171 from c3701ea992f7421f7d4cf78184b765e178c63707 to qt-release

Change-Id: I80e4ef31c9f31df807ad44583a5615f69f1865ea