Snap for 5999326 from b71789b3b1ddcf43250b860ec76b1cc414f4fffe to qt-d4-release

Change-Id: Ie8c99cd7b34d143f0513e24722e519010676b8c5