Snap for 5090430 from 12f5b946763208694ec30f32fdcca05f1efe9ee3 to qt-release

Change-Id: I51566ff695af2e0f17d87b512d0cdd1fab461d77