Snap for 4806815 from e76ed816b94f1e89be3f965152ea83dd48f67b51 to qt-release

Change-Id: If3751eba17ba1a62392b83b1122629f3423f96c1