Snap for 5571215 from f339436f90a7cd63f2aceeed35f8bdd685e467cf to qt-release

Change-Id: I4a7a37d5f4ab6420314970cc41c864ae0bc6db6d