Snap for 5090430 from 72921aa14d55f22e473212bf25f6dd3249cf05c3 to qt-release

Change-Id: Iaf0a258dfabbc0b4b46e1d3cac43c4f83ba3015e