Snap for 6258405 from 99651b012bfb45cbb178151366f843ed28307cab to qt-qpr3-release

Change-Id: I7eb71966befe0ad93e73a2341cabb13c3252b37b