Snap for 5663715 from c58c10a973d5aa9206ed7f6dfb64a733b62ea63d to qt-qpr1-release

Change-Id: I7a1ce57c60c47ccf7b49da07fe56c5b4867bdaef