Snap for 5726885 from e818cccd58f3c550ef92c8e0e9ddffbf8916c336 to qt-qpr1-release

Change-Id: I571deedb1a0159d6a1b9a51c2f28b81bc23fbc7d