Snap for 5333170 from 49a8b6265e63705cd97be33f8180e76898fa5cf1 to qt-release

Change-Id: I47d3ee36fbe20bc2f2271c19f4a769d6b7f7dd21