Snap for 6285821 from 7e96f3de037db234737890a5c1dbaaa506dcda2d to qt-qpr3-release

Change-Id: I6bc6651fb9dedd09f54c1f7dfdb691831a3a52cd