Snap for 5727820 from df956ee6873078d93d17ca21b0adc0628cd58050 to qt-c2f2-release

Change-Id: I33c491e47fe1b3773a900e0d6c7704bcca204778