Snap for 5797413 from daec2560da083886af71323ae98593e13dda0cca to qt-qpr1-release

Change-Id: I7102cba0736578f4467eba5f6fc458687a840297