Snap for 6083172 from a8a3e4ccf97111fe9ba87176a67daf95d0df84a4 to qt-qpr2-release

Change-Id: I2cd3b46f9b41390b1bd9c645362609b8d1636237