Snap for 5998981 from d97d82bae35d13491c07143c99b837af8e8dc759 to qt-qpr2-release

Change-Id: I3f963084f55f741f6a84fb8b2c89e1616845630a