Snap for 5800161 from d7a235fc0ca8f9f2908aaa3693e584a5bba5dcae to qt-qpr1-release

Change-Id: If36d5ec3cba8776655730dc2ec4f8cdce745c4ec