Snap for 5246489 from ecf16deac92a3b6a5c114c535df34dca6bad0018 to qt-release

Change-Id: I074affa44cc55d1eb2cf0278edbfa1017f1d7351