Snap for 6013205 from 73d6b59977595c1d0a222a1656f298e7991e43b9 to qt-qpr2-release

Change-Id: Iff21574beecab30cf178551e037d60b92d3bdd09