Snap for 5733681 from 1674790b4cabab6cedc4dfefb9829f96ba8b6d5b to qt-qpr1-release

Change-Id: Ic3fa62ffc38081759f80b3c833c5c7eeb45b54ae