Snap for 4816034 from f5f2d8cc13a2a7136f2e6c7eee6975350d72eab7 to qt-release

Change-Id: I46fbcd79edf81eff6a6d21df859a17fa621cee1c