Snap for 5706813 from 41d77405d6e8bde886fab97e788759e37c30b49e to qt-qpr1-release

Change-Id: I2b2301fedcf0ef0a6ccf6b02c34df0a799481876