Snap for 6049975 from 0f4d4806e45ea000a37dbd517df4aaf3a3831bc8 to qt-qpr2-release

Change-Id: I9aa82532e21041804b4802b94520708e773fbf50