Snap for 5688259 from 3b06a7cb258dcdc2493088ca0bc59f64b3989db9 to qt-qpr1-release

Change-Id: Ie9b4f0d71f45d855387d886c75971c9f6c0ac591