Snap for 5582435 from a79871af3ca959b96eb1f7976ee491f4e6848ed5 to qt-qpr1-release

Change-Id: I153051dc652ef75b9f171d75bf51f4b0330db097