Snap for 5587110 from 7bc5b4f6490359aa8df13be057ecc7ef83c15e95 to qt-release

Change-Id: I67a5b9286f0d30aaa233ade381fa31e0e509fef3