Snap for 5719381 from bb0838b5114419b4f8ecff67c0b6fb728399c7b7 to qt-qpr1-release

Change-Id: I2d8f8e10162f876d23a573d1bf43f871e599224b