Snap for 5220519 from 4a691ec31ff5160363c3cb7a7349d31a8895963f to qt-release

Change-Id: I58c5b96ee035f3a29f44d0e8f8d00221bcde018d