Snap for 5171533 from 73d5dd1c81da188264a51795132468198628aba0 to qt-release

Change-Id: I0ab433815494bc03dbb2861412a58311c8ac0220