Snap for 5998981 from eabac9b58a40fa21089a860eed366fb9e84be92e to qt-qpr2-release

Change-Id: Idab67b79298aef22935ff40013610967fd25e48e