Snap for 5422062 from 8befdc73f169f51ac537f0d2a2eb36d978aa641f to qt-release

Change-Id: If082da82ee40b05410d7f7394e493a2759c645a7