Snap for 5645017 from 5ac1671ba678b91262c0864da21ad91953ae86ed to qt-release

Change-Id: I9f54c131c3ce55850795cedb1eb662a5d8c0576a