Snap for 5853686 from e834aba82a150ffb36059cf451ffd4692fbd0c8a to qt-qpr1-release

Change-Id: I6ab7832ab689601f59e453b10caa3177101d3b0c