Snap for 5606075 from 92f188b249cd0a99e50a04c6f70df207d66defc1 to qt-c2f2-release

Change-Id: I729fbaf3f00c5448b7d10a52ebac41a54efcfb96