Snap for 5434517 from 89bce6ef926ea42e0b77b9098e8bb41b6568c4da to qt-release

Change-Id: I7fc800b3097de540eb25c41a523541eddc38d459