Snap for 5743138 from edda945dded799de5e863d018b49234404ceb2c6 to qt-qpr1-release

Change-Id: I2f3d1a2fdae17102ea190ef5251fd377c53ca0f6